diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:20:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 00:20:48 -0800 |
| commit | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (patch) | |
| tree | e03a7afb1884d2b4f8f1e45ee6a945baebd95806 /builtin-commit.c | |
| parent | 1a56be134f9477296a7ade040e8b802bf3a643a1 (diff) | |
| download | git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.gz git-cb6020bb017405cc3e7f1faea6f30d4fd1b62e70.tar.xz | |
Teach --[no-]rerere-autoupdate option to merge, revert and friends
Introduce a command line option to override rerere.autoupdate configuration
variable to make it more useful.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index e93a647c5..72e0f0b56 100644 --- 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); |