aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rerere.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/rerere.c')
-rw-r--r--builtin/rerere.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c
index 81b65ffa39..ae34515583 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -48,7 +48,10 @@ static int diff_two(const char *file1, const char *label1,
return ret;
}
-int cmd_rerere(int argc, const char **argv, const char *prefix)
+int cmd_rerere(int argc,
+ const char **argv,
+ const char *prefix,
+ struct repository *repo UNUSED)
{
struct string_list merge_rr = STRING_LIST_INIT_DUP;
int i, autoupdate = -1, flags = 0;