summaryrefslogtreecommitdiff
path: root/resolve-undo.c
Commit message (Expand)AuthorAgeFilesLines
* resolve-undo: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-1/+1
* read-cache: be specific what part of the index has changedNguyễn Thái Ngọc Duy2014-06-131-1/+1
* Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano2014-02-271-1/+1
|\
| * pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-241-1/+1
* | read-cache.c: fix memory leaks caused by removed cache entriesKarsten Blees2013-11-181-2/+5
|/
* Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-091-2/+2
|\
| * convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-2/+2
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-3/+3
|/
* checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-271-1/+18
* Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen2010-07-051-19/+15
* string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-271-1/+1
* string_list: Fix argument order for string_list_insertJulian Phillips2010-06-271-2/+2
* string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-271-1/+1
* build: make code "-Wpointer-arith" cleanJunio C Hamano2010-02-011-2/+2
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+59
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-251-0/+117
View Lorry Controller Status