Merge branch 'pb/ref-filter-with-crlf'

[thirdparty/git.git] / rebase-interactive.h

diff --git a/rebase-interactive.h b/rebase-interactive.h
index 971da037769476da196ae39eec89431be4923d54..dc2cf0ee122c70a9c9b4e614be058ee5c423dd80 100644 (file)
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -1,8 +1,21 @@
 #ifndef REBASE_INTERACTIVE_H
 #define REBASE_INTERACTIVE_H
 
-void append_todo_help(unsigned edit_todo, unsigned keep_empty,
+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(unsigned flags);
+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