diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:39 -0800 |
| commit | 770dd00ebdb67455f0490982f8619b927792b837 (patch) | |
| tree | 467b76e688cc706b9d3941caa5e65a88ff7a94af /sequencer.h | |
| parent | 7fc1495b1800f5207b634140ed66f7037e7f4bff (diff) | |
| parent | d596118d7a9b104db10e64b2680a30ea80f1439c (diff) | |
| download | git-770dd00ebdb67455f0490982f8619b927792b837.tar.gz git-770dd00ebdb67455f0490982f8619b927792b837.tar.xz | |
Merge branch 'jn/maint-sequencer-fixes' into maint
* 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 f435fdb4b..2d4528f29 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 |