Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)Author
2014-12-18Sync with v2.2.1Junio C Hamano
2014-12-17Sync with v2.0.5Junio C Hamano
2014-12-17Sync with v1.9.5Junio C Hamano
2014-12-17Sync with v1.8.5.6Junio C Hamano
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano
2014-12-17unpack-trees: propagate errors adding entries to the indexJeff King
2014-12-13Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano
2014-11-18unpack_trees: plug leakage of o->resultJunio C Hamano
2014-09-20Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano
2014-09-11Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano
2014-08-26checkout -m: attempt merge when deletion of path was stagedJonathan Nieder
2014-08-13unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder
2014-08-13unpack-trees: simplify 'all other failures' caseStefan Beller
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano
2014-06-20cleanup duplicate name_compare() functionsJeremiah Mahler
2014-06-19use xstrfmt in favor of manual size calculationsJeff King
2014-06-13read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy
2014-06-13read-cache: split-index modeNguyễn Thái Ngọc Duy
2014-06-13read-cache: save index SHA-1 after readingNguyễn Thái Ngọc Duy
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy
2014-06-13cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy
2014-06-13unpack-trees: be specific what part of the index has changedNguyễn Thái Ngọc Duy
2014-03-15Merge branch 'nd/i18n-progress'Junio C Hamano
2014-02-28Merge branch 'kb/fast-hashmap'Junio C Hamano
2014-02-24i18n: mark all progress lines for translationNguyễn Thái Ngọc Duy
2013-12-17Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano
2013-12-17Prevent buffer overflows when path is too longAntoine Pelisse
2013-12-06Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano
2013-11-19name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees
2013-11-19name-hash.c: use new hash map implementation for cache entriesKarsten Blees
2013-11-04unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King
2013-09-17employ new explicit "exists in index?" APIEric Sunshine
2013-08-14unpack-trees: plug a memory leakFelipe Contreras
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-06-25Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano
2013-06-17unpack-trees: don't shift conflicts left and rightRené Scharfe
2013-06-03unpack-trees: free cache_entry array members for mergesRené Scharfe
2013-06-03diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe
2013-06-03diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe
2013-06-03unpack-trees: create working copy of merge entry in merged_entryRené Scharfe
2013-06-03unpack-trees: factor out dup_entryRené Scharfe
2013-04-15dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees
2013-01-24Merge branch 'as/check-ignore'Junio C Hamano
2013-01-11Merge branch 'as/dir-c-cleanup'Junio C Hamano
2013-01-07dir.c: use a single struct exclude_list per source of excludesAdam Spiers
2012-12-29dir.c: rename free_excludes() to clear_exclude_list()Adam Spiers
2012-12-29dir.c: rename excluded_from_list() to is_excluded_from_list()Adam Spiers
2012-12-29dir.c: rename path_excluded() to is_path_excluded()Adam Spiers
2012-12-21oneway_merge(): only lstat() when told to update worktreeMartin von Zweigbergk
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 22:07:37 +0300