pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 5028138898bf0d95d969ea19b85d23af129912d0..34f9acee910406c7ba0bf9eed76267a0cf8f46c2 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -120,6 +120,11 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
        if (argc < 2)
                return rerere(flags);
 
+       if (!strcmp(argv[1], "forget")) {
+               const char **pathspec = get_pathspec(prefix, argv + 2);
+               return rerere_forget(pathspec);
+       }
+
        fd = setup_rerere(&merge_rr, flags);
        if (fd < 0)
                return 0;