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