summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-031-3/+40
|\
| * unpack-trees: support super-prefix optionsb/unpack-trees-super-prefixStefan Beller2017-01-251-3/+40
* | Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-181-23/+30
|\ \ | |/ |/|
| * unpack-trees: factor progress setup out of check_updatessb/unpack-trees-cleanupStefan Beller2017-01-101-12/+20
| * unpack-trees: remove unneeded continueStefan Beller2017-01-101-1/+0
| * unpack-trees: move checkout state into check_updatesStefan Beller2017-01-101-12/+12
* | Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano2016-12-191-1/+1
|\ \ | |/ |/|
| * unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-051-1/+1
* | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-221-3/+1
* | Merge branch 'rs/unpack-trees-reduce-file-scope-global'Junio C Hamano2016-09-211-4/+5
|\ \
| * | unpack-trees: pass checkout state explicitly to check_updates()René Scharfe2016-09-131-4/+5
* | | Merge branch 'bc/object-id'Junio C Hamano2016-09-191-4/+4
|\ \ \
| * | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-4/+4
| |/ /
* | | unpack-trees: do not capitalize "working"ah/misc-message-fixesAlex Henrie2016-09-081-2/+2
|/ /
* | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-271-9/+9
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-171-4/+2
|\ \
| * | unpack-trees.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-4/+2
* | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-171-20/+54
|\ \ \ | | |/ | |/|
| * | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updatesVasco Almeida2016-05-121-13/+47
| * | i18n: unpack-trees: mark strings for translationVasco Almeida2016-04-121-12/+12
| |/
* | struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-251-2/+2
|/
* unpack-trees: fix accidentally quadratic behaviordt/unpack-compare-entry-optimDavid Turner2016-01-221-1/+12
* do_compare_entry: use already-computed pathDavid Turner2016-01-051-2/+36
* replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King2015-09-251-3/+1
* Sync with 2.5.2Junio C Hamano2015-09-091-7/+10
|\
| * Sync with 2.4.9Junio C Hamano2015-09-041-7/+10
| |\
| | * Sync with 2.2.3Junio C Hamano2015-09-041-7/+10
| | |\
| | | * verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-041-7/+10
| * | | Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-191-0/+4
| |\ \ \
* | \ \ \ Merge branch 'jk/git-path'Junio C Hamano2015-08-191-1/+3
|\ \ \ \ \
| * | | | | prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-101-1/+3
* | | | | | Merge branch 'dt/unpack-trees-cache-tree-revalidate'Junio C Hamano2015-08-121-0/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | unpack-trees: populate cache-tree on successful mergedt/unpack-trees-cache-tree-revalidateBrian Degenhardt2015-07-281-0/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'as/sparse-checkout-removal'Junio C Hamano2015-08-031-0/+4
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removalDavid Turner2015-07-211-0/+4
* | | | untracked cache: invalidate at index addition or removalNguyễn Thái Ngọc Duy2015-03-121-2/+5
| |/ / |/| |
* | | Sync with v2.2.1Junio C Hamano2014-12-181-4/+6
|\ \ \ | | |/ | |/|
| * | Sync with v2.0.5Junio C Hamano2014-12-171-4/+6
| |\ \ | | |/
| | * Sync with v1.9.5Junio C Hamano2014-12-171-4/+6
| | |\
| | | * Sync with v1.8.5.6Junio C Hamano2014-12-171-4/+6
| | | |\
| | | | * Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-171-4/+6
| | | | |\
| | | | | * unpack-trees: propagate errors adding entries to the indexJeff King2014-12-171-4/+6
| * | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-191-21/+10
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano2014-12-121-0/+2
|\ \ \ \ \ \ \
| * | | | | | | unpack_trees: plug leakage of o->resultjc/unpack-trees-plug-leakJunio C Hamano2014-11-171-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano2014-09-111-21/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletionJonathan Nieder2014-08-251-5/+6
| * | | | | unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder2014-08-131-8/+4
| * | | | | unpack-trees: simplify 'all other failures' caseStefan Beller2014-08-131-10/+2
| |/ / / /
| * | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-171-8/+17
| |\ \ \ \ | | |_|_|/ | |/| | |
View Lorry Controller Status