Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-01-21 | Make 'rerere forget' work from a subdirectory. | 1 | -22/+49 | |
2010-01-10 | rerere forget path: forget recorded resolution | 1 | -0/+25 | |
2009-12-25 | resolve-undo: teach "update-index --unresolve" to use resolve-undo info | 1 | -0/+7 | |
2009-12-25 | resolve-undo: "checkout -m path" uses resolve-undo information | 1 | -0/+11 | |
2009-12-25 | resolve-undo: allow plumbing to clear the information | 1 | -0/+12 | |
2009-12-25 | resolve-undo: basic tests | 1 | -0/+88 |