diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:54:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:54:21 (GMT) |
| commit | 4dbeecba27983a86c17383280856bbbe385ceb8d (patch) | |
| tree | bca9b0de3bfbb74a70ccc8db6bd6999433f8ad02 /sequencer.h | |
| parent | f7f43afb190131d4502f00cecd2361ebbd654030 (diff) | |
| parent | 5a5445d8788058c6d038f5f4072316db0d250eeb (diff) | |
| download | git-4dbeecba27983a86c17383280856bbbe385ceb8d.zip git-4dbeecba27983a86c17383280856bbbe385ceb8d.tar.gz git-4dbeecba27983a86c17383280856bbbe385ceb8d.tar.bz2 | |
Merge branch 'ag/edit-todo-drop-check'
Allow the rebase.missingCommitsCheck configuration to kick in when
"rebase --edit-todo" and "rebase --continue" restarts the procedure.
* ag/edit-todo-drop-check:
rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
sequencer: move check_todo_list_from_file() to rebase-interactive.c
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index 74f1e26..393571e 100644 --- a/sequencer.h +++ b/sequencer.h @@ -11,6 +11,7 @@ const char *git_path_commit_editmsg(void); const char *git_path_seq_dir(void); const char *rebase_path_todo(void); const char *rebase_path_todo_backup(void); +const char *rebase_path_dropped(void); #define APPEND_SIGNOFF_DEDUP (1u << 0) @@ -155,7 +156,6 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, void todo_list_add_exec_commands(struct todo_list *todo_list, struct string_list *commands); -int check_todo_list_from_file(struct repository *r); int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, const char *shortrevisions, const char *onto_name, struct commit *onto, const char *orig_head, struct string_list *commands, |