X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=d8098762f62a9dfb991f64702d34047182cfa951;hb=9b55aa03daebf43067021b7d58abea249229987b;hp=fecedd3b4635c79adcbe0e26613af079beff64d0;hpb=e2d0a2e440bcf3d3f4134317ba539d79d4092918;p=git.git diff --git a/branch.c b/branch.c index fecedd3b4..d8098762f 100644 --- a/branch.c +++ b/branch.c @@ -3,6 +3,7 @@ #include "refs.h" #include "remote.h" #include "commit.h" +#include "sequencer.h" struct tracking { struct refspec spec; @@ -245,4 +246,5 @@ void remove_branch_state(void) unlink(git_path("MERGE_MSG")); unlink(git_path("MERGE_MODE")); unlink(git_path("SQUASH_MSG")); + remove_sequencer_state(0); }