mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
8c22bd9ff9
"git rebase" has learned to use the merge backend (i.e. the machinery that drives "rebase -i") by default, while allowing "--apply" option to use the "apply" backend (e.g. the moral equivalent of "format-patch piped to am"). The rebase.backend configuration variable can be set to customize. * en/rebase-backend: rebase: rename the two primary rebase backends rebase: change the default backend from "am" to "merge" rebase: make the backend configurable via config setting rebase tests: repeat some tests using the merge backend instead of am rebase tests: mark tests specific to the am-backend with --am rebase: drop '-i' from the reflog for interactive-based rebases git-prompt: change the prompt for interactive-based rebases rebase: add an --am option rebase: move incompatibility checks between backend options a bit earlier git-rebase.txt: add more details about behavioral differences of backends rebase: allow more types of rebases to fast-forward t3432: make these tests work with either am or merge backends rebase: fix handling of restrict_revision rebase: make sure to pass along the quiet flag to the sequencer rebase, sequencer: remove the broken GIT_QUIET handling t3406: simplify an already simple test rebase (interactive-backend): fix handling of commits that become empty rebase (interactive-backend): make --keep-empty the default t3404: directly test the behavior of interest git-rebase.txt: update description of --allow-empty-message
22 lines
651 B
C
22 lines
651 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);
|
|
|
|
int check_todo_list_from_file(struct repository *r);
|
|
|
|
#endif
|