diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-23 02:22:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-23 02:22:08 (GMT) |
| commit | 9fd389b65002e0e23deb2c7328360f246afec0d4 (patch) | |
| tree | 6f18d8e46376adb637fddb8fca407c54021365bc /builtin/commit.c | |
| parent | e14d63198867c545d0662afc00bf7be048bf2231 (diff) | |
| parent | c427b211b3f5d3f967e5fc7abd526b02f83a7246 (diff) | |
| download | git-9fd389b65002e0e23deb2c7328360f246afec0d4.zip git-9fd389b65002e0e23deb2c7328360f246afec0d4.tar.gz git-9fd389b65002e0e23deb2c7328360f246afec0d4.tar.bz2 | |
Merge branch 'jn/revert-quit'
* jn/revert-quit:
revert: remove --reset compatibility option
revert: introduce --abort to cancel a failed cherry-pick
revert: write REVERT_HEAD pseudoref during conflicted revert
revert: improve error message for cherry-pick during cherry-pick
revert: rearrange pick_revisions() for clarity
revert: rename --reset option to --quit
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c46f2d1..8f2bebe 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1514,6 +1514,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) } unlink(git_path("CHERRY_PICK_HEAD")); + unlink(git_path("REVERT_HEAD")); unlink(git_path("MERGE_HEAD")); unlink(git_path("MERGE_MSG")); unlink(git_path("MERGE_MODE")); |