Merge branch 'nd/checkout-noisy-unmerge'

diff --git a/sequencer.h b/sequencer.h
index 2caecd550b869945ceb020929fdb5fc06728d901..93e891309bb7982c283c77e8950ba8848fdd7d2b 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -40,6 +40,8 @@ struct replay_opts {
        int allow_empty_message;
        int keep_redundant_commits;
        int verbose;
+       int quiet;
+       int reschedule_failed_exec;
 
        int mainline;