Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git_attr(): fix function signature
[gitweb.git]
/
builtin-rerere.c
diff --git
a/builtin-rerere.c
b/builtin-rerere.c
index 2be9ffb77b38ae687537f3599c9d11e3fbc026a9..0253abf9b698ed10a8df5c21ef07c93b8e6460dc 100644
(file)
--- a/
builtin-rerere.c
+++ b/
builtin-rerere.c
@@
-110,6
+110,8
@@
int cmd_rerere(int argc, const char **argv, const char *prefix)
if (!strcmp(argv[1], "-h"))
usage(git_rerere_usage);
+ else if (!strcmp(argv[1], "forget"))
+ return rerere_forget(argv + 2);
fd = setup_rerere(&merge_rr);
if (fd < 0)