X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rerere.c;h=34f9acee910406c7ba0bf9eed76267a0cf8f46c2;hb=74da98f9c761b2e63366a643fa52749844ddc6a1;hp=5028138898bf0d95d969ea19b85d23af129912d0;hpb=533e8af50ed6e89eabc421478c9021c4da5f404d;p=git.git

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 502813889..34f9acee9 100644
--- 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;