summaryrefslogtreecommitdiff
path: root/resolve-undo.h
Commit message (Expand)AuthorAgeFilesLines
* resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson2018-03-141-1/+1
* convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
* checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-271-0/+1
* build: make code "-Wpointer-arith" cleanJunio C Hamano2010-02-011-1/+1
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+2
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-251-0/+14