diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
| commit | 5229c9b232de5bfa959ad6ebbb4c8192ac513352 (patch) | |
| tree | 8539e7e23682cac110900f946f034ae44162cacd /third_party/git/rebase-interactive.h | |
| parent | f2b211131f2347342dde63975b09cf603149f1a3 (diff) | |
| parent | 8518a7a51faaf50f830646d4c3585f51236b9349 (diff) | |
merge(3p/git): Merge git upstream at v2.26.2 r/808
Diffstat (limited to 'third_party/git/rebase-interactive.h')
| -rw-r--r-- | third_party/git/rebase-interactive.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/git/rebase-interactive.h b/third_party/git/rebase-interactive.h index 44dbb06311a8..dc2cf0ee122c 100644 --- a/third_party/git/rebase-interactive.h +++ b/third_party/git/rebase-interactive.h @@ -5,12 +5,17 @@ struct strbuf; struct repository; struct todo_list; -void append_todo_help(unsigned keep_empty, int command_count, +void append_todo_help(int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf); int edit_todo_list(struct repository *r, struct todo_list *todo_list, struct todo_list *new_todo, const char *shortrevisions, const char *shortonto, unsigned flags); + int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); +int todo_list_check_against_backup(struct repository *r, + struct todo_list *todo_list); + +int check_todo_list_from_file(struct repository *r); #endif |