summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-3/+15
|\ \ \ \ \
| * | | | | read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy2014-06-131-1/+3
| * | | | | read-cache: split-index modeNguyễn Thái Ngọc Duy2014-06-131-0/+4
| * | | | | read-cache: save index SHA-1 after readingNguyễn Thái Ngọc Duy2014-06-131-0/+1
| * | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-131-0/+1
| * | | | | cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy2014-06-131-1/+1
| * | | | | unpack-trees: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-2/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-091-11/+6
|\ \ \ \ \
| * | | | | use xstrfmt in favor of manual size calculationsJeff King2014-06-191-11/+6
| |/ / / /
* | | | | cleanup duplicate name_compare() functionsjm/dedup-name-compareJeremiah Mahler2014-06-201-11/+0
|/ / / /
* | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-141-1/+1
|\ \ \ \
| * | | | i18n: mark all progress lines for translationnd/i18n-progressNguyễn Thái Ngọc Duy2014-02-241-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-02-271-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees2013-11-181-1/+1
| * | | name-hash.c: use new hash map implementation for cache entriesKarsten Blees2013-11-181-1/+0
| |/ /
* | | Prevent buffer overflows when path is too longap/path-maxAntoine Pelisse2013-12-161-24/+27
* | | Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-051-8/+17
|\ \ \ | |/ / |/| / | |/
| * unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* | employ new explicit "exists in index?" APIEric Sunshine2013-09-171-2/+2
* | unpack-trees: plug a memory leakfc/unpack-trees-leakfixFelipe Contreras2013-08-131-1/+3
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-7/+7
* | Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano2013-06-241-15/+3
|\ \
| * | unpack-trees: don't shift conflicts left and rightRené Scharfe2013-06-171-15/+3
* | | unpack-trees: free cache_entry array members for mergesRené Scharfe2013-06-021-3/+10
* | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-021-8/+13
* | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-021-41/+50
* | | unpack-trees: create working copy of merge entry in merged_entryRené Scharfe2013-06-021-5/+12
* | | unpack-trees: factor out dup_entryRené Scharfe2013-06-021-3/+9
|/ /
* | dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-151-9/+1
* | Merge branch 'as/check-ignore'Junio C Hamano2013-01-231-1/+1
|\ \
| * | dir.c: use a single struct exclude_list per source of excludesAdam Spiers2013-01-061-1/+1
* | | Merge branch 'as/dir-c-cleanup'Junio C Hamano2013-01-101-5/+7
|\ \ \ | |/ /
| * | dir.c: rename free_excludes() to clear_exclude_list()Adam Spiers2012-12-281-1/+1
| * | dir.c: rename excluded_from_list() to is_excluded_from_list()Adam Spiers2012-12-281-3/+5
| * | dir.c: rename path_excluded() to is_path_excluded()Adam Spiers2012-12-281-1/+1
| * | Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-111-1/+10
| |\ \
View Lorry Controller Status