summaryrefslogtreecommitdiffstats
path: root/resolve-undo.h
AgeCommit message (Expand)AuthorLines
2024-12-18resolve-undo: stop using `the_repository`Patrick Steinhardt-2/+4
2024-06-14hash-ll: merge with "hash.h"Patrick Steinhardt-1/+1
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano-4/+2
2023-07-31resolve-undo: allow resurrecting conflicted state that resolved to deletionJunio C Hamano-0/+1
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren-1/+1
2023-04-11treewide: reduce includes of cache.h in other headersElijah Newren-1/+6
2019-05-05*.[ch]: remove extern from function declarations using spatchDenton Liu-7/+7
2018-08-15Add missing includes and forward declarationsElijah Newren-0/+2
2018-03-14resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson-1/+1
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