Merge branch 'nd/commit-doc'

diff --git a/sequencer.h b/sequencer.h
index 9d83f0f3e90313be990439972845e9d4f2bc1804..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;
 
@@ -124,7 +126,8 @@ int update_head_with_reflog(const struct commit *old_head,
                            const struct object_id *new_head,
                            const char *action, const struct strbuf *msg,
                            struct strbuf *err);
-void commit_post_rewrite(const struct commit *current_head,
+void commit_post_rewrite(struct repository *r,
+                        const struct commit *current_head,
                         const struct object_id *new_head);
 
 int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);