Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Revert "reset: Make reset remove the sequencer state"
[gitweb.git]
/
branch.c
diff --git
a/branch.c
b/branch.c
index fecedd3b4635c79adcbe0e26613af079beff64d0..a6b6722e24bc196a54be5ab1240e8932e53483e2 100644
(file)
--- a/
branch.c
+++ b/
branch.c
@@
-240,6
+240,7
@@
void create_branch(const char *head,
void remove_branch_state(void)
{
unlink(git_path("CHERRY_PICK_HEAD"));
+ unlink(git_path("REVERT_HEAD"));
unlink(git_path("MERGE_HEAD"));
unlink(git_path("MERGE_RR"));
unlink(git_path("MERGE_MSG"));