aboutsummaryrefslogtreecommitdiff
path: root/resolve-undo.c
Commit message (Expand)AuthorAge
* cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-07
* resolve-undo: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-13
* read-cache: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-13
* Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano2014-02-27
|\
| * pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-24
* | read-cache.c: fix memory leaks caused by removed cache entriesKarsten Blees2013-11-18
|/
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\
| * convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-15
* | Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
|/
* checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-27
* Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-05
* string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-27
* string_list: Fix argument order for string_list_insertJulian Phillips2010-06-27
* string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-27
* build: make code "-Wpointer-arith" cleanJunio C Hamano2010-02-01
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-25
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-25
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 22:54:00 +0000