| 2010-01-20 | Merge branch 'jc/cache-unmerge' | blob | diff | raw | |
| 2010-01-11 | rerere forget path: forget recorded resolution | blob | diff | raw | |
| 2009-12-26 | resolve-undo: teach "update-index --unresolve" to use... | blob | diff | raw | diff to current | |
| 2009-12-26 | resolve-undo: "checkout -m path" uses resolve-undo... | blob | diff | raw | diff to current | |
| 2009-12-26 | resolve-undo: allow plumbing to clear the information | blob | diff | raw | diff to current | |
| 2009-12-26 | resolve-undo: basic tests | blob | diff | raw | diff to current | |