mirror of
https://github.com/git/git.git
synced 2026-01-27 19:12:01 +00:00
bda7d60fd6
Prepare for the current interactive-rebase patch thicket, backported to `maint` (actually, our latest start of a merging rebase). This reverts commitb358f8dfe0, reversing changes made to9e699f5eb6. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
52 lines
1017 B
C
52 lines
1017 B
C
#ifndef SEQUENCER_H
|
|
#define SEQUENCER_H
|
|
|
|
const char *git_path_seq_dir(void);
|
|
|
|
#define APPEND_SIGNOFF_DEDUP (1u << 0)
|
|
|
|
enum replay_action {
|
|
REPLAY_REVERT,
|
|
REPLAY_PICK
|
|
};
|
|
|
|
struct replay_opts {
|
|
enum replay_action action;
|
|
|
|
/* Boolean options */
|
|
int edit;
|
|
int record_origin;
|
|
int no_commit;
|
|
int signoff;
|
|
int allow_ff;
|
|
int allow_rerere_auto;
|
|
int allow_empty;
|
|
int allow_empty_message;
|
|
int keep_redundant_commits;
|
|
|
|
int mainline;
|
|
|
|
char *gpg_sign;
|
|
|
|
/* Merge strategy */
|
|
char *strategy;
|
|
char **xopts;
|
|
size_t xopts_nr, xopts_alloc;
|
|
|
|
/* Only used by REPLAY_NONE */
|
|
struct rev_info *revs;
|
|
};
|
|
#define REPLAY_OPTS_INIT { -1 }
|
|
|
|
int sequencer_pick_revisions(struct replay_opts *opts);
|
|
int sequencer_continue(struct replay_opts *opts);
|
|
int sequencer_rollback(struct replay_opts *opts);
|
|
int sequencer_remove_state(struct replay_opts *opts);
|
|
|
|
extern const char sign_off_header[];
|
|
|
|
void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
|
|
void append_conflicts_hint(struct strbuf *msgbuf);
|
|
|
|
#endif
|