summaryrefslogtreecommitdiff
path: root/resolve-undo.h
AgeCommit message (Expand)AuthorFilesLines
2018-08-15Add missing includes and forward declarationsLibravatar Elijah Newren1-0/+2
2018-03-14resolve-undo: convert struct resolve_undo_info to object_idLibravatar brian m. carlson1-1/+1
2013-07-15convert unmerge_cache to take struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-03-27checkout: avoid unnecessary match_pathspec callsLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2010-02-01build: make code "-Wpointer-arith" cleanLibravatar Junio C Hamano1-1/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+2
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-0/+14