Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
revert: simplify getting commit subject in format_todo()
[gitweb.git]
/
builtin
/
commit.c
diff --git
a/builtin/commit.c
b/builtin/commit.c
index c46f2d18e10bcb3b1b458d4ae94d2d3522305632..8f2bebecf313a0e4b742f9327ec178c7e3547dd2 100644
(file)
--- 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"));