summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
commit4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch)
tree77d37de207313b760eb08c502be1ea98a18351e9 /builtin-commit.c
parent26b9f5cc99a35d4f678c2f565e48237fc9515444 (diff)
parentcb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (diff)
downloadgit-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.gz
Merge branch 'jc/rerere'
* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index e644871210..69241f8ed6 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -1255,7 +1255,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover.");
- rerere();
+ rerere(0);
run_hook(get_index_file(), "post-commit", NULL);
if (!quiet)
print_summary(prefix, commit_sha1);