summaryrefslogtreecommitdiff
path: root/resolve-undo.c
Commit message (Expand)AuthorAgeFilesLines
* 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