diff options
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sequencer.h b/sequencer.h index 7cca49eff2..a515ee4457 100644 --- a/sequencer.h +++ b/sequencer.h @@ -41,6 +41,8 @@ struct replay_opts { int allow_empty_message; int keep_redundant_commits; int verbose; + int quiet; + int reschedule_failed_exec; int mainline; @@ -152,8 +154,6 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla unsigned autosquash, struct todo_list *todo_list); int todo_list_rearrange_squash(struct todo_list *todo_list); -extern const char sign_off_header[]; - /* * Append a signoff to the commit message in "msgbuf". The ignore_footer * parameter specifies the number of bytes at the end of msgbuf that should @@ -171,7 +171,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); |