06aa5e4ea4
With the `--preserve-merges` option going away, we no longer need this function. Helped-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
20 lines
597 B
C
20 lines
597 B
C
#ifndef REBASE_INTERACTIVE_H
|
|
#define REBASE_INTERACTIVE_H
|
|
|
|
struct strbuf;
|
|
struct repository;
|
|
struct todo_list;
|
|
|
|
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);
|
|
|
|
#endif
|