summaryrefslogtreecommitdiff
path: root/resolve-undo.c
AgeCommit message (Expand)Author
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-03-27checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy
2010-07-05Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips
2010-06-27string_list: Fix argument order for for_each_string_listJulian Phillips
2010-02-02build: make code "-Wpointer-arith" cleanJunio C Hamano
2009-12-26resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano
2009-12-26resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano