summaryrefslogtreecommitdiffstats
path: root/resolve-undo.h
AgeCommit message (Expand)AuthorLines
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy-1/+1
2013-03-27checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy-0/+1
2010-02-01build: make code "-Wpointer-arith" cleanJunio C Hamano-1/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano-0/+2
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano-0/+14