projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "reset: Make reset remove the sequencer state"
[git.git]
/
branch.c
diff --git
a/branch.c
b/branch.c
index 025a97be0281b9fd3ccff2b36c03495b005ac4fe..a6b6722e24bc196a54be5ab1240e8932e53483e2 100644
(file)
--- a/
branch.c
+++ b/
branch.c
@@
-3,7
+3,6
@@
#include "refs.h"
#include "remote.h"
#include "commit.h"
-#include "sequencer.h"
struct tracking {
struct refspec spec;
@@
-247,5
+246,4
@@
void remove_branch_state(void)
unlink(git_path("MERGE_MSG"));
unlink(git_path("MERGE_MODE"));
unlink(git_path("SQUASH_MSG"));
- remove_sequencer_state(0);
}