This series resurrects the topic we discussed later November. I wrote a bit about this in http://gitster.livejournal.com/43665.html but as usual with my patches, they do come with minimum set of tests but it contains no documentation updates. The user visible changes are: - ls-files has a new option primarily for debugging; - update-index has a new option --clear-resolve-undo; - rerere has a new subcommand forget. Junio C Hamano (9): builtin-merge.c: use standard active_cache macros resolve-undo: record resolved conflicts in a new index extension section resolve-undo: basic tests resolve-undo: allow plumbing to clear the information resolve-undo: "checkout -m path" uses resolve-undo information resolve-undo: teach "update-index --unresolve" to use resolve-undo info rerere: remove silly 1024-byte line limit rerere: refactor rerere logic to make it independent from I/O rerere forget path: forget recorded resolution Makefile | 2 + builtin-checkout.c | 6 + builtin-ls-files.c | 43 +++++++- builtin-merge.c | 9 +- builtin-read-tree.c | 2 + builtin-rerere.c | 2 + builtin-update-index.c | 18 +++- cache.h | 4 + read-cache.c | 18 +++ rerere.c | 259 +++++++++++++++++++++++++++++++++++++------- rerere.h | 1 + resolve-undo.c | 176 ++++++++++++++++++++++++++++++ resolve-undo.h | 16 +++ t/t2030-unresolve-info.sh | 140 ++++++++++++++++++++++++ 14 files changed, 648 insertions(+), 48 deletions(-) create mode 100644 resolve-undo.c create mode 100644 resolve-undo.h create mode 100755 t/t2030-unresolve-info.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html