Merge branch 'nd/branch-v-alignment'

diff --git a/sequencer.h b/sequencer.h
index aa5f17cc3079f39000e9d7526d24354a027daabd..d8494201e0a0ba052356de1094b25bac5b9024c0 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;