summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorAlban Gruin <alban.gruin@gmail.com>2018-09-27 21:56:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-09 01:44:10 (GMT)
commit53bbcfbde7c29611f16722c3fbcdb2b78718f633 (patch)
tree4a2761ec2411f5e88e3c024f928566499171e7b2 /git.c
parentd59cd14de8e05111f45ad55a507493225cd849bc (diff)
downloadgit-53bbcfbde7c29611f16722c3fbcdb2b78718f633.zip
git-53bbcfbde7c29611f16722c3fbcdb2b78718f633.tar.gz
git-53bbcfbde7c29611f16722c3fbcdb2b78718f633.tar.bz2
rebase -i: implement the main part of interactive rebase as a builtin
This rewrites the part of interactive rebase which initializes the basic state, make the script and complete the action, as a buitin, named git-rebase--interactive2 for now. Others modes (`--continue`, `--edit-todo`, etc.) will be rewritten in the next commit. git-rebase--interactive.sh is modified to call git-rebase--interactive2 instead of git-rebase--helper. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index 3fded74..8309fb2 100644
--- a/git.c
+++ b/git.c
@@ -518,6 +518,7 @@ static struct cmd_struct commands[] = {
{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
+ { "rebase--interactive2", cmd_rebase__interactive, RUN_SETUP | NEED_WORK_TREE },
{ "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },