Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ag/maint-apply-too-large-p'
[gitweb.git]
/
builtin-rerere.c
diff --git
a/builtin-rerere.c
b/builtin-rerere.c
index 5028138898bf0d95d969ea19b85d23af129912d0..25f507a2f1df89919d966b7f586fd57d9c57a227 100644
(file)
--- a/
builtin-rerere.c
+++ b/
builtin-rerere.c
@@
-120,6
+120,9
@@
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);
+
fd = setup_rerere(&merge_rr, flags);
if (fd < 0)
return 0;