Merge branch 'th/difftool-diffall'

diff --git a/sequencer.h b/sequencer.h
index bb4b13830e157dafb468f8256bab25110058ba9b..aa5f17cc3079f39000e9d7526d24354a027daabd 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -29,6 +29,8 @@ struct replay_opts {
        int signoff;
        int allow_ff;
        int allow_rerere_auto;
+       int allow_empty;
+       int keep_redundant_commits;
 
        int mainline;