diff --git a/builtin/rerere.c b/builtin/rerere.c
index 67cbfeb152386a1c918a103a2073d83138bfdff0..82358855d1da90b75f94c3d424a5da5c0f97960e 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
#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,
};
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);
}