path: root/git.c
diff options
authorJunio C Hamano <>2018-11-02 02:04:53 (GMT)
committerJunio C Hamano <>2018-11-02 02:04:53 (GMT)
commitb49ef560ed66449d24a3fdfe25972c390bb44951 (patch)
tree60534d673f60750d6cc4ef2a709ef7a847fc7cdf /git.c
parent5ae50845d8a30d7db32e139ce04b712f9deb99cd (diff)
parent34b47315d9721a576b9536492cca0c11588113a2 (diff)
Merge branch 'ag/rebase-i-in-c'
Rewrite of the remaining "rebase -i" machinery in C. * ag/rebase-i-in-c: rebase -i: move rebase--helper modes to rebase--interactive rebase -i: remove 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 'git.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 8e52276..2f604a4 100644
--- a/git.c
+++ b/git.c
@@ -532,7 +532,7 @@ static struct cmd_struct commands[] = {
{ "rebase", cmd_rebase },
- { "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE },
+ { "rebase--interactive", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
{ "remote", cmd_remote, RUN_SETUP },