Merge branch 'jc/diff-sane-truncate-no-more' into next

diff --git a/sequencer.h b/sequencer.h
index 7a513c576bdccf8730828fdaa586ec9d0af4af6b..f885b68395f4bff1ded96c0ab84ed87d164f0c7d 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -7,7 +7,8 @@ const char *git_path_seq_dir(void);
 
 enum replay_action {
        REPLAY_REVERT,
-       REPLAY_PICK
+       REPLAY_PICK,
+       REPLAY_INTERACTIVE_REBASE
 };
 
 struct replay_opts {
@@ -23,6 +24,7 @@ struct replay_opts {
        int allow_empty;
        int allow_empty_message;
        int keep_redundant_commits;
+       int verbose;
 
        int mainline;