Merge branch 'nd/branch-v-alignment'

diff --git a/sequencer.h b/sequencer.h
index bb4b13830e157dafb468f8256bab25110058ba9b..d8494201e0a0ba052356de1094b25bac5b9024c0 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -29,6 +29,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;