aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
...
* | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \ \ \ \
| * | | | | read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy2014-06-13
| * | | | | read-cache: split-index modeNguyễn Thái Ngọc Duy2014-06-13
| * | | | | read-cache: save index SHA-1 after readingNguyễn Thái Ngọc Duy2014-06-13
| * | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-13
| * | | | | cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy2014-06-13
| * | | | | unpack-trees: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-13
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-09
|\ \ \ \ \
| * | | | | use xstrfmt in favor of manual size calculationsJeff King2014-06-19
| |/ / / /
* | | | | cleanup duplicate name_compare() functionsJeremiah Mahler2014-06-20
|/ / / /
* | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-14
|\ \ \ \
| * | | | i18n: mark all progress lines for translationNguyễn Thái Ngọc Duy2014-02-24
| | |_|/ | |/| |
* | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-02-27
|\ \ \ \ | |/ / / |/| | |
| * | | name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees2013-11-18
| * | | name-hash.c: use new hash map implementation for cache entriesKarsten Blees2013-11-18
| |/ /
* | | Prevent buffer overflows when path is too longAntoine Pelisse2013-12-16
* | | Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-05
|\ \ \ | |/ / |/| / | |/
| * unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-04
* | employ new explicit "exists in index?" APIEric Sunshine2013-09-17
* | unpack-trees: plug a memory leakFelipe Contreras2013-08-13
* | Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
* | Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano2013-06-24
|\ \
| * | unpack-trees: don't shift conflicts left and rightRené Scharfe2013-06-17
* | | unpack-trees: free cache_entry array members for mergesRené Scharfe2013-06-02
* | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-02
* | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-02
* | | unpack-trees: create working copy of merge entry in merged_entryRené Scharfe2013-06-02
* | | unpack-trees: factor out dup_entryRené Scharfe2013-06-02
|/ /
* | dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-15
* | Merge branch 'as/check-ignore'Junio C Hamano2013-01-23
|\ \
| * | dir.c: use a single struct exclude_list per source of excludesAdam Spiers2013-01-06
* | | Merge branch 'as/dir-c-cleanup'Junio C Hamano2013-01-10
|\ \ \ | |/ /
| * | dir.c: rename free_excludes() to clear_exclude_list()Adam Spiers2012-12-28
| * | dir.c: rename excluded_from_list() to is_excluded_from_list()Adam Spiers2012-12-28
| * | dir.c: rename path_excluded() to is_path_excluded()Adam Spiers2012-12-28
| * | Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-11
| |\ \
* | | | oneway_merge(): only lstat() when told to update worktreeMartin von Zweigbergk2012-12-20
* | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-23
|\ \ \ \
| * | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-11
* | | | | Replace strlen() with ce_namelen()Thomas Gummerer2012-07-08
|/ / / /
* | | | Merge branch 'jc/ls-files-i-dir'Junio C Hamano2012-06-21
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano2012-06-05
| |/
* | Merge branch 'maint'Junio C Hamano2012-05-20
|\ \
| * | Consistently use "superproject" instead of "supermodule"Jens Lehmann2012-05-20
* | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-02
|\ \ \
| * | | remove superfluous newlines in error messagesPete Wyckoff2012-04-30
| |/ /
* | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-02
|\ \ \ | |/ / |/| |
| * | unpack-trees: preserve the index file version of originalJunio C Hamano2012-04-27
| |/
* | unpack-trees: plug minor memory leakRené Scharfe2012-04-10
* | unpack-trees: don't perform any index operation if we're not mergingRené Scharfe2012-04-10
|/