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