Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint | Junio C Hamano | 2016-09-29 | 1 | -4/+5 |
|\ | |||||
| * | unpack-trees: pass checkout state explicitly to check_updates() | René Scharfe | 2016-09-13 | 1 | -4/+5 |
* | | unpack-trees: do not capitalize "working"ah/misc-message-fixes | Alex Henrie | 2016-09-08 | 1 | -2/+2 |
|/ | |||||
* | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messages | Alex Henrie | 2016-06-27 | 1 | -9/+9 |
* | Merge branch 'nd/error-errno' | Junio C Hamano | 2016-05-17 | 1 | -4/+2 |
|\ | |||||
| * | unpack-trees.c: use error_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -4/+2 |
* | | Merge branch 'va/i18n-misc-updates' | Junio C Hamano | 2016-05-17 | 1 | -20/+54 |
|\ \ | |||||
| * | | i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updates | Vasco Almeida | 2016-05-12 | 1 | -13/+47 |
| * | | i18n: unpack-trees: mark strings for translation | Vasco Almeida | 2016-04-12 | 1 | -12/+12 |
| |/ | |||||
* | | struct name_entry: use struct object_id instead of unsigned char sha1[20] | brian m. carlson | 2016-04-25 | 1 | -2/+2 |
|/ | |||||
* | unpack-trees: fix accidentally quadratic behaviordt/unpack-compare-entry-optim | David Turner | 2016-01-22 | 1 | -1/+12 |
* | do_compare_entry: use already-computed path | David Turner | 2016-01-05 | 1 | -2/+36 |
* | replace trivial malloc + sprintf / strcpy calls with xstrfmt | Jeff King | 2015-09-25 | 1 | -3/+1 |
* | Sync with 2.5.2 | Junio C Hamano | 2015-09-09 | 1 | -7/+10 |
|\ | |||||
| * | Sync with 2.4.9 | Junio C Hamano | 2015-09-04 | 1 | -7/+10 |
| |\ | |||||
| | * | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 | 1 | -7/+10 |
| | |\ | |||||
| | | * | verify_absent: allow filenames longer than PATH_MAX | Jeff King | 2015-09-04 | 1 | -7/+10 |
| * | | | Merge branch 'as/sparse-checkout-removal' into maint | Junio C Hamano | 2015-08-19 | 1 | -0/+4 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jk/git-path' | Junio C Hamano | 2015-08-19 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | prefer git_pathdup to git_path in some possibly-dangerous cases | Jeff King | 2015-08-10 | 1 | -1/+3 |
* | | | | | | Merge branch 'dt/unpack-trees-cache-tree-revalidate' | Junio C Hamano | 2015-08-12 | 1 | -0/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | unpack-trees: populate cache-tree on successful mergedt/unpack-trees-cache-tree-revalidate | Brian Degenhardt | 2015-07-28 | 1 | -0/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'as/sparse-checkout-removal' | Junio C Hamano | 2015-08-03 | 1 | -0/+4 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removal | David Turner | 2015-07-21 | 1 | -0/+4 |
* | | | | untracked cache: invalidate at index addition or removal | Nguyễn Thái Ngọc Duy | 2015-03-12 | 1 | -2/+5 |
| |/ / |/| | | |||||
* | | | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 | 1 | -4/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 1 | -4/+6 |
| |\ \ | | |/ | |||||
| | * | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 1 | -4/+6 |
| | |\ | |||||
| | | * | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 1 | -4/+6 |
| | | |\ | |||||
| | | | * | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 | 1 | -4/+6 |
| | | | |\ | |||||
| | | | | * | unpack-trees: propagate errors adding entries to the index | Jeff King | 2014-12-17 | 1 | -4/+6 |
| * | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint | Junio C Hamano | 2014-09-19 | 1 | -21/+10 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jc/unpack-trees-plug-leak' | Junio C Hamano | 2014-12-12 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | unpack_trees: plug leakage of o->resultjc/unpack-trees-plug-leak | Junio C Hamano | 2014-11-17 | 1 | -0/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' | Junio C Hamano | 2014-09-11 | 1 | -21/+10 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | |||||
| * | | | | | checkout -m: attempt merge when deletion of path was stagedjn/unpack-trees-checkout-m-carry-deletion | Jonathan Nieder | 2014-08-25 | 1 | -5/+6 |
| * | | | | | unpack-trees: use 'cuddled' style for if-else cascade | Jonathan Nieder | 2014-08-13 | 1 | -8/+4 |
| * | | | | | unpack-trees: simplify 'all other failures' case | Stefan Beller | 2014-08-13 | 1 | -10/+2 |
| |/ / / / | |||||
| * | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 | 1 | -8/+17 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -3/+15 |
|\ \ \ \ \ | |||||
| * | | | | | read-cache: mark updated entries for split index | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -1/+3 |
| * | | | | | read-cache: split-index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+4 |
| * | | | | | read-cache: save index SHA-1 after reading | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry() | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -0/+1 |
| * | | | | | cache-tree: mark istate->cache_changed on cache tree invalidation | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -1/+1 |
| * | | | | | unpack-trees: be specific what part of the index has changed | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -2/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/xstrfmt' | Junio C Hamano | 2014-07-09 | 1 | -11/+6 |
|\ \ \ \ \ | |||||
| * | | | | | use xstrfmt in favor of manual size calculations | Jeff King | 2014-06-19 | 1 | -11/+6 |
| |/ / / / | |||||
* | | | | | cleanup duplicate name_compare() functionsjm/dedup-name-compare | Jeremiah Mahler | 2014-06-20 | 1 | -11/+0 |
|/ / / / | |||||
* | | | | Merge branch 'nd/i18n-progress' | Junio C Hamano | 2014-03-14 | 1 | -1/+1 |
|\ \ \ \ |