diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 00:05:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 00:05:45 (GMT) |
| commit | b8fc5abd73e2e81c396844c09e8003de320709e5 (patch) | |
| tree | 3a96eb03f4853272dd9d0d170ccab6c8cf3db082 /sequencer.h | |
| parent | ea4ef304870d2517ec177f92b000c744bd44cc0c (diff) | |
| parent | d596118d7a9b104db10e64b2680a30ea80f1439c (diff) | |
| download | git-b8fc5abd73e2e81c396844c09e8003de320709e5.zip git-b8fc5abd73e2e81c396844c09e8003de320709e5.tar.gz git-b8fc5abd73e2e81c396844c09e8003de320709e5.tar.bz2 | |
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
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sequencer.h b/sequencer.h index f435fdb..2d4528f 100644 --- a/sequencer.h +++ b/sequencer.h @@ -2,19 +2,11 @@ #define SEQUENCER_H #define SEQ_DIR "sequencer" -#define SEQ_OLD_DIR "sequencer-old" #define SEQ_HEAD_FILE "sequencer/head" #define SEQ_TODO_FILE "sequencer/todo" #define SEQ_OPTS_FILE "sequencer/opts" -/* - * Removes SEQ_OLD_DIR and renames SEQ_DIR to SEQ_OLD_DIR, ignoring - * any errors. Intended to be used by 'git reset'. - * - * With the aggressive flag, it additionally removes SEQ_OLD_DIR, - * ignoring any errors. Inteded to be used by the sequencer's - * '--quit' subcommand. - */ -void remove_sequencer_state(int aggressive); +/* Removes SEQ_DIR. */ +extern void remove_sequencer_state(void); #endif |