mirror of
https://github.com/git/git.git
synced 2026-03-16 19:50:09 +01:00
dc26bd8397
* master: Update 1.7.8 draft release notes in preparation for rc4 revert: remove --reset compatibility option revert: introduce --abort to cancel a failed cherry-pick revert: write REVERT_HEAD pseudoref during conflicted revert revert: improve error message for cherry-pick during cherry-pick revert: rearrange pick_revisions() for clarity revert: rename --reset option to --quit Conflicts: builtin/revert.c
29 lines
727 B
C
29 lines
727 B
C
#ifndef SEQUENCER_H
|
|
#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"
|
|
|
|
enum replay_action { REPLAY_REVERT, REPLAY_PICK };
|
|
|
|
struct replay_insn_list {
|
|
enum replay_action action;
|
|
struct commit *operand;
|
|
struct replay_insn_list *next;
|
|
};
|
|
|
|
/*
|
|
* 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);
|
|
|
|
#endif
|