Merge branch 'jk/checkout-out-of-unborn' into maint

diff --git a/sequencer.h b/sequencer.h
index aa5f17cc3079f39000e9d7526d24354a027daabd..9d57d57524d411c54d55346a5ecff67bc256595c 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -30,6 +30,7 @@ struct replay_opts {
        int allow_ff;
        int allow_rerere_auto;
        int allow_empty;
+       int allow_empty_message;
        int keep_redundant_commits;
 
        int mainline;
@@ -43,9 +44,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);
+
 #endif