aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
* Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-03
|\
| * unpack-trees: support super-prefix optionStefan Beller2017-01-25
* | Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-18
|\ \ | |/ |/|
| * unpack-trees: factor progress setup out of check_updatesStefan Beller2017-01-10
| * unpack-trees: remove unneeded continueStefan Beller2017-01-10
| * unpack-trees: move checkout state into check_updatesStefan Beller2017-01-10
* | Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano2016-12-19
|\ \ | |/ |/|
| * unpack-trees: fix grammar for untracked files in directoriesStefan Beller2016-12-05
* | introduce CHECKOUT_INITRené Scharfe2016-09-22
* | Merge branch 'rs/unpack-trees-reduce-file-scope-global'Junio C Hamano2016-09-21
|\ \
| * | unpack-trees: pass checkout state explicitly to check_updates()René Scharfe2016-09-13
* | | Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\ \ \
| * | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-07
| |/ /
* | | unpack-trees: do not capitalize "working"Alex Henrie2016-09-08
|/ /
* | unpack-trees: fix English grammar in do-this-before-that messagesAlex Henrie2016-06-27
* | Merge branch 'nd/error-errno'Junio C Hamano2016-05-17
|\ \
| * | unpack-trees.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-09
* | | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-17
|\ \ \ | | |/ | |/|
| * | i18n: unpack-trees: avoid substituting only a verb in sentencesVasco Almeida2016-05-12
| * | i18n: unpack-trees: mark strings for translationVasco Almeida2016-04-12
| |/
* | struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-25
|/
* unpack-trees: fix accidentally quadratic behaviorDavid Turner2016-01-22
* do_compare_entry: use already-computed pathDavid Turner2016-01-05
* replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King2015-09-25
* Sync with 2.5.2Junio C Hamano2015-09-09
|\
| * Sync with 2.4.9Junio C Hamano2015-09-04
| |\
| | * Sync with 2.2.3Junio C Hamano2015-09-04
| | |\
| | | * verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-04
| * | | Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-19
| |\ \ \
* | \ \ \ Merge branch 'jk/git-path'Junio C Hamano2015-08-19
|\ \ \ \ \
| * | | | | prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-10
* | | | | | Merge branch 'dt/unpack-trees-cache-tree-revalidate'Junio C Hamano2015-08-12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | unpack-trees: populate cache-tree on successful mergeBrian Degenhardt2015-07-28
| | |_|/ / | |/| | |
* | | | | Merge branch 'as/sparse-checkout-removal'Junio C Hamano2015-08-03
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner2015-07-21
* | | | untracked cache: invalidate at index addition or removalNguyễn Thái Ngọc Duy2015-03-12
| |/ / |/| |
* | | Sync with v2.2.1Junio C Hamano2014-12-18
|\ \ \ | | |/ | |/|
| * | Sync with v2.0.5Junio C Hamano2014-12-17
| |\ \ | | |/
| | * Sync with v1.9.5Junio C Hamano2014-12-17
| | |\
| | | * Sync with v1.8.5.6Junio C Hamano2014-12-17
| | | |\
| | | | * Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-17
| | | | |\
| | | | | * unpack-trees: propagate errors adding entries to the indexJeff King2014-12-17
| * | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2014-09-19
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano2014-12-12
|\ \ \ \ \ \ \
| * | | | | | | unpack_trees: plug leakage of o->resultJunio C Hamano2014-11-17
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano2014-09-11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | checkout -m: attempt merge when deletion of path was stagedJonathan Nieder2014-08-25
| * | | | | unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder2014-08-13
| * | | | | unpack-trees: simplify 'all other failures' caseStefan Beller2014-08-13
| |/ / / /
| * | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-17
| |\ \ \ \ | | |_|_|/ | |/| | |