Second batch for 2.12
[git/debian.git] / sequencer.h
blob7a513c576bdccf8730828fdaa586ec9d0af4af6b
1 #ifndef SEQUENCER_H
2 #define SEQUENCER_H
4 const char *git_path_seq_dir(void);
6 #define APPEND_SIGNOFF_DEDUP (1u << 0)
8 enum replay_action {
9 REPLAY_REVERT,
10 REPLAY_PICK
13 struct replay_opts {
14 enum replay_action action;
16 /* Boolean options */
17 int edit;
18 int record_origin;
19 int no_commit;
20 int signoff;
21 int allow_ff;
22 int allow_rerere_auto;
23 int allow_empty;
24 int allow_empty_message;
25 int keep_redundant_commits;
27 int mainline;
29 char *gpg_sign;
31 /* Merge strategy */
32 char *strategy;
33 char **xopts;
34 size_t xopts_nr, xopts_alloc;
36 /* Only used by REPLAY_NONE */
37 struct rev_info *revs;
39 #define REPLAY_OPTS_INIT { -1 }
41 int sequencer_pick_revisions(struct replay_opts *opts);
42 int sequencer_continue(struct replay_opts *opts);
43 int sequencer_rollback(struct replay_opts *opts);
44 int sequencer_remove_state(struct replay_opts *opts);
46 extern const char sign_off_header[];
48 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
49 void append_conflicts_hint(struct strbuf *msgbuf);
51 #endif