/
uis
/
git
/
x
/
uis
/
git
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Introduce CHERRY_PICK_HEAD
[git/git.git]
/
branch.c
diff --git
a/branch.c
b/branch.c
index
93dc866
..
dc23e95
100644
(file)
--- a/
branch.c
+++ b/
branch.c
@@
-217,6
+217,7
@@
void create_branch(const char *head,
void remove_branch_state(void)
{
+ unlink(git_path("CHERRY_PICK_HEAD"));
unlink(git_path("MERGE_HEAD"));
unlink(git_path("MERGE_RR"));
unlink(git_path("MERGE_MSG"));