path: root/resolve-undo.h
AgeCommit message (Expand)Author
2019-05-05*.[ch]: remove extern from function declarations using spatchDenton Liu
2018-08-15Add missing includes and forward declarationsElijah Newren
2018-03-14resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy
2013-03-27checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy
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