diff options
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sequencer.h b/sequencer.h index bb4b13830e..1fc22dcabe 100644 --- a/sequencer.h +++ b/sequencer.h @@ -6,6 +6,8 @@ #define SEQ_TODO_FILE "sequencer/todo" #define SEQ_OPTS_FILE "sequencer/opts" +#define APPEND_SIGNOFF_DEDUP (1u << 0) + enum replay_action { REPLAY_REVERT, REPLAY_PICK @@ -29,6 +31,9 @@ struct replay_opts { int signoff; int allow_ff; int allow_rerere_auto; + int allow_empty; + int allow_empty_message; + int keep_redundant_commits; int mainline; @@ -41,9 +46,10 @@ struct replay_opts { struct rev_info *revs; }; -/* Removes SEQ_DIR. */ -extern void remove_sequencer_state(void); - int sequencer_pick_revisions(struct replay_opts *opts); +extern const char sign_off_header[]; + +void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag); + #endif |