Merge branch 'jn/maint-sequencer-fixes'

* jn/maint-sequencer-fixes:
  revert: stop creating and removing sequencer-old directory
  Revert "reset: Make reset remove the sequencer state"
  revert: do not remove state until sequence is finished
  revert: allow single-pick in the middle of cherry-pick sequence
  revert: pass around rev-list args in already-parsed form
  revert: allow cherry-pick --continue to commit before resuming
  revert: give --continue handling its own function
This commit is contained in:
Junio C Hamano
2011-12-19 16:05:45 -08:00
6 changed files with 251 additions and 125 deletions

View File

@ -3,7 +3,6 @@
#include "refs.h"
#include "remote.h"
#include "commit.h"
#include "sequencer.h"
struct tracking {
struct refspec spec;
@ -280,5 +279,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);
}