| Commit message (Expand) | Author | Age |
* | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 |
|\ |
|
| * | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 |
| |\ |
|
| | * | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 |
| | |\ |
|
| | | * | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 |
| | | |\ |
|
| | | | * | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 |
| | | | |\ |
|
| | | | | * | unpack-trees: propagate errors adding entries to the index | Jeff King | 2014-12-17 |
| * | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maint | Junio C Hamano | 2014-09-19 |
| |\ \ \ \ \ |
|
* | \ \ \ \ \ | Merge branch 'jc/unpack-trees-plug-leak' | Junio C Hamano | 2014-12-12 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | unpack_trees: plug leakage of o->result | Junio C Hamano | 2014-11-17 |
| | |_|_|_|/ /
| |/| | | | | |
|
* | | | | | | | Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' | Junio C Hamano | 2014-09-11 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | / / / /
| | |/ / / /
| |/| | | | |
|
| * | | | | | checkout -m: attempt merge when deletion of path was staged | Jonathan Nieder | 2014-08-25 |
| * | | | | | unpack-trees: use 'cuddled' style for if-else cascade | Jonathan Nieder | 2014-08-13 |
| * | | | | | unpack-trees: simplify 'all other failures' case | Stefan Beller | 2014-08-13 |
| |/ / / / |
|
| * | | | | Merge branch 'jk/two-way-merge-corner-case-fix' into maint | Junio C Hamano | 2013-12-17 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 |
|\ \ \ \ \ |
|
| * | | | | | read-cache: mark updated entries for split index | Nguyễn Thái Ngọc Duy | 2014-06-13 |
| * | | | | | read-cache: split-index mode | Nguyễn Thái Ngọc Duy | 2014-06-13 |
| * | | | | | read-cache: save index SHA-1 after reading | Nguyễn Thái Ngọc Duy | 2014-06-13 |
| * | | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry() | Nguyễn Thái Ngọc Duy | 2014-06-13 |
| * | | | | | cache-tree: mark istate->cache_changed on cache tree invalidation | Nguyễn Thái Ngọc Duy | 2014-06-13 |
| * | | | | | unpack-trees: be specific what part of the index has changed | Nguyễn Thái Ngọc Duy | 2014-06-13 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'jk/xstrfmt' | Junio C Hamano | 2014-07-09 |
|\ \ \ \ \ |
|
| * | | | | | use xstrfmt in favor of manual size calculations | Jeff King | 2014-06-19 |
| |/ / / / |
|
* | | | | | cleanup duplicate name_compare() functions | Jeremiah Mahler | 2014-06-20 |
|/ / / / |
|
* | | | | Merge branch 'nd/i18n-progress' | Junio C Hamano | 2014-03-14 |
|\ \ \ \ |
|
| * | | | | i18n: mark all progress lines for translation | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'kb/fast-hashmap' | Junio C Hamano | 2014-02-27 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | name-hash.c: remove cache entries instead of marking them CE_UNHASHED | Karsten Blees | 2013-11-18 |
| * | | | name-hash.c: use new hash map implementation for cache entries | Karsten Blees | 2013-11-18 |
| |/ / |
|
* | | | Prevent buffer overflows when path is too long | Antoine Pelisse | 2013-12-16 |
* | | | Merge branch 'jk/two-way-merge-corner-case-fix' | Junio C Hamano | 2013-12-05 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | unpack-trees: fix "read-tree -u --reset A B" with conflicted index | Jeff King | 2013-11-04 |
* | | employ new explicit "exists in index?" API | Eric Sunshine | 2013-09-17 |
* | | unpack-trees: plug a memory leak | Felipe Contreras | 2013-08-13 |
* | | Convert "struct cache_entry *" to "const ..." wherever possible | Nguyễn Thái Ngọc Duy | 2013-07-09 |
* | | Merge branch 'rs/unpack-trees-tree-walk-conflict-field' | Junio C Hamano | 2013-06-24 |
|\ \ |
|
| * | | unpack-trees: don't shift conflicts left and right | René Scharfe | 2013-06-17 |
* | | | unpack-trees: free cache_entry array members for merges | René Scharfe | 2013-06-02 |
* | | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const | René Scharfe | 2013-06-02 |
* | | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers const | René Scharfe | 2013-06-02 |
* | | | unpack-trees: create working copy of merge entry in merged_entry | René Scharfe | 2013-06-02 |
* | | | unpack-trees: factor out dup_entry | René Scharfe | 2013-06-02 |
|/ / |
|
* | | dir.c: replace is_path_excluded with now equivalent is_excluded API | Karsten Blees | 2013-04-15 |
* | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-01-23 |
|\ \ |
|
| * | | dir.c: use a single struct exclude_list per source of excludes | Adam Spiers | 2013-01-06 |
* | | | Merge branch 'as/dir-c-cleanup' | Junio C Hamano | 2013-01-10 |
|\ \ \
| |/ / |
|
| * | | dir.c: rename free_excludes() to clear_exclude_list() | Adam Spiers | 2012-12-28 |
| * | | dir.c: rename excluded_from_list() to is_excluded_from_list() | Adam Spiers | 2012-12-28 |
| * | | dir.c: rename path_excluded() to is_path_excluded() | Adam Spiers | 2012-12-28 |
| * | | Merge branch 'jc/ls-files-i-dir' into maint | Junio C Hamano | 2012-07-11 |
| |\ \ |
|