From 53bbcfbde7c29611f16722c3fbcdb2b78718f633 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Thu, 27 Sep 2018 23:56:07 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 909a687857..71f8f45fe5 100644 --- a/Makefile +++ b/Makefile @@ -1060,6 +1060,7 @@ BUILTIN_OBJS += builtin/prune.o BUILTIN_OBJS += builtin/pull.o BUILTIN_OBJS += builtin/push.o BUILTIN_OBJS += builtin/read-tree.o +BUILTIN_OBJS += builtin/rebase--interactive2.o BUILTIN_OBJS += builtin/rebase--helper.o BUILTIN_OBJS += builtin/receive-pack.o BUILTIN_OBJS += builtin/reflog.o -- cgit v1.3-5-g9baa