summaryrefslogtreecommitdiff
path: root/t/t2030-unresolve-info.sh
AgeCommit message (Expand)AuthorFilesLines
2013-04-04rerere forget: do not segfault if not all stages are presentLibravatar Johannes Sixt1-0/+13
2013-04-02rerere forget: grok files containing NULLibravatar Johannes Sixt1-0/+12
2012-04-11tests: modernise style: more uses of test_line_countLibravatar Stefano Lattarini1-1/+1
2010-01-21Make 'rerere forget' work from a subdirectory.Libravatar Johannes Sixt1-22/+49
2010-01-10rerere forget path: forget recorded resolutionLibravatar Junio C Hamano1-0/+25
2009-12-25resolve-undo: teach "update-index --unresolve" to use resolve-undo infoLibravatar Junio C Hamano1-0/+7
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+11
2009-12-25resolve-undo: allow plumbing to clear the informationLibravatar Junio C Hamano1-0/+12
2009-12-25resolve-undo: basic testsLibravatar Junio C Hamano1-0/+88