diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 18:13:01 -0800 |
| commit | 4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch) | |
| tree | 77d37de207313b760eb08c502be1ea98a18351e9 /builtin-commit.c | |
| parent | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' (diff) | |
| parent | Teach --[no-]rerere-autoupdate option to merge, revert and friends (diff) | |
| download | git-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.gz git-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.zip | |
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.c | 2 |
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); |