Merge branch 'jc/cache-unmerge'

* jc/cache-unmerge:
  rerere forget path: forget recorded resolution
  rerere: refactor rerere logic to make it independent from I/O
  rerere: remove silly 1024-byte line limit
  resolve-undo: teach "update-index --unresolve" to use resolve-undo info
  resolve-undo: "checkout -m path" uses resolve-undo information
  resolve-undo: allow plumbing to clear the information
  resolve-undo: basic tests
  resolve-undo: record resolved conflicts in a new index extension section
  builtin-merge.c: use standard active_cache macros

Conflicts:
	builtin-ls-files.c
	builtin-merge.c
	builtin-rerere.c

1 files changed, 3 insertions, 0 deletions

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 502813889..25f507a2f 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -120,6 +120,9 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 	if (argc < 2)
 		return rerere(flags);
 
+	if (!strcmp(argv[1], "forget"))
+		return rerere_forget(argv + 2);
+
 	fd = setup_rerere(&merge_rr, flags);
 	if (fd < 0)
 		return 0;