diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-10-11 14:18:19 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-11 14:18:19 +0900 |
commit | 5ab7e0fb67007bd4829b85a8b450bd952e97fe00 (patch) | |
tree | e9252517ae596c24d4cca1d924ddc0ff394f5238 /builtin.h | |
parent | builtin rebase: error out on incompatible option/mode combinations (diff) | |
parent | rebase -i: move rebase--helper modes to rebase--interactive (diff) | |
download | tgif-5ab7e0fb67007bd4829b85a8b450bd952e97fe00.tar.xz |
Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c
* ag/rebase-i-in-c:
rebase -i: move rebase--helper modes to rebase--interactive
rebase -i: remove git-rebase--interactive.sh
rebase--interactive2: rewrite the submodes of interactive rebase in C
rebase -i: implement the main part of interactive rebase as a builtin
rebase -i: rewrite init_basic_state() in C
rebase -i: rewrite write_basic_state() in C
rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C
rebase -i: implement the logic to initialize $revisions in C
rebase -i: remove unused modes and functions
rebase -i: rewrite complete_action() in C
t3404: todo list with commented-out commands only aborts
sequencer: change the way skip_unnecessary_picks() returns its result
sequencer: refactor append_todo_help() to write its message to a buffer
rebase -i: rewrite checkout_onto() in C
rebase -i: rewrite setup_reflog_action() in C
sequencer: add a new function to silence a command, except if it fails
rebase -i: rewrite the edit-todo functionality in C
editor: add a function to launch the sequence editor
rebase -i: rewrite append_todo_help() in C
sequencer: make three functions and an enum from sequencer.c public
Diffstat (limited to 'builtin.h')
-rw-r--r-- | builtin.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -203,7 +203,7 @@ extern int cmd_pull(int argc, const char **argv, const char *prefix); extern int cmd_push(int argc, const char **argv, const char *prefix); extern int cmd_read_tree(int argc, const char **argv, const char *prefix); extern int cmd_rebase(int argc, const char **argv, const char *prefix); -extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix); +extern int cmd_rebase__interactive(int argc, const char **argv, const char *prefix); extern int cmd_receive_pack(int argc, const char **argv, const char *prefix); extern int cmd_reflog(int argc, const char **argv, const char *prefix); extern int cmd_remote(int argc, const char **argv, const char *prefix); |