aboutsummaryrefslogtreecommitdiffstats
path: root/resolve-undo.h
AgeCommit message (Expand)AuthorFilesLines
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-4/+2
2023-07-31resolve-undo: allow resurrecting conflicted state that resolved to deletionJunio C Hamano1-0/+1
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren1-1/+1
2023-04-11treewide: reduce includes of cache.h in other headersElijah Newren1-1/+6
2019-05-05*.[ch]: remove extern from function declarations using spatchDenton Liu1-7/+7
2018-08-15Add missing includes and forward declarationsElijah Newren1-0/+2
2018-03-14resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson1-1/+1
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-03-27checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy1-0/+1
2010-02-01build: make code "-Wpointer-arith" cleanJunio C Hamano1-1/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano1-0/+2
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano1-0/+14