Age | Commit message (Expand) | Author |
---|---|---|
2013-04-04 | rerere forget: do not segfault if not all stages are present | Johannes Sixt |
2013-04-03 | rerere forget: grok files containing NUL | Johannes Sixt |
2012-04-11 | tests: modernise style: more uses of test_line_count | Stefano Lattarini |
2010-01-21 | Make 'rerere forget' work from a subdirectory. | Johannes Sixt |
2010-01-11 | rerere forget path: forget recorded resolution | Junio C Hamano |
2009-12-26 | resolve-undo: teach "update-index --unresolve" to use resolve-undo info | Junio C Hamano |
2009-12-26 | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano |
2009-12-26 | resolve-undo: allow plumbing to clear the information | Junio C Hamano |
2009-12-26 | resolve-undo: basic tests | Junio C Hamano |