Teach --[no-]rerere-autoupdate option to merge, revert and friends

diff --git a/builtin-commit.c b/builtin-commit.c
index e93a647c59f1f52a4b0eb92b6c84fd9cec0aad6a..72e0f0b563ee08993f0b73fa868ad525edc5f8ab 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -1150,7 +1150,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);