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

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 25f507a2f1df89919d966b7f586fd57d9c57a227..34f9acee910406c7ba0bf9eed76267a0cf8f46c2 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -120,8 +120,10 @@ 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);
+       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)