X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Frerere.c;h=82358855d1da90b75f94c3d424a5da5c0f97960e;hb=50aaeca008194854dcc90836edaff58b9be6e0fc;hp=67cbfeb152386a1c918a103a2073d83138bfdff0;hpb=8978166e531e0941811099d4117574ebbbcf35d8;p=git.git

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 67cbfeb15..82358855d 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -8,7 +8,7 @@
 #include "xdiff-interface.h"
 
 static const char * const rerere_usage[] = {
-	"git rerere [clear | status | remaining | diff | gc]",
+	"git rerere [clear | forget path... | status | remaining | diff | gc]",
 	NULL,
 };
 
@@ -136,7 +136,10 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 		return rerere(flags);
 
 	if (!strcmp(argv[0], "forget")) {
-		const char **pathspec = get_pathspec(prefix, argv + 1);
+		const char **pathspec;
+		if (argc < 2)
+			warning("'git rerere forget' without paths is deprecated");
+		pathspec = get_pathspec(prefix, argv + 1);
 		return rerere_forget(pathspec);
 	}