summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 23:50:34 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-13 23:50:34 +0900
commit7ba06bc3d026cee54437db5cfddfffe7b4d7a187 (patch)
treeeec56549e6d2e5593981ec2540b77f4a46e80309 /Makefile
parentMerge branch 'jk/perf-aggregate-wo-libjson' (diff)
parentrebase -i: run without forking rebase--interactive (diff)
downloadtgif-7ba06bc3d026cee54437db5cfddfffe7b4d7a187.tar.xz
Merge branch 'pw/rebase-i-internal'
The internal implementation of "git rebase -i" has been updated to avoid forking a separate "rebase--interactive" process. * pw/rebase-i-internal: rebase -i: run without forking rebase--interactive rebase: use a common action enum rebase -i: use struct rebase_options in do_interactive_rebase() rebase -i: use struct rebase_options to parse args rebase -i: use struct object_id for squash_onto rebase -i: use struct commit when parsing options rebase -i: remove duplication rebase -i: combine rebase--interactive.c with rebase.c rebase: use OPT_RERERE_AUTOUPDATE() rebase: rename write_basic_state() rebase: don't translate trace strings sequencer: always discard index after checkout
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6d433f8703..5b0855c7e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1106,7 +1106,6 @@ BUILTIN_OBJS += builtin/push.o
BUILTIN_OBJS += builtin/range-diff.o
BUILTIN_OBJS += builtin/read-tree.o
BUILTIN_OBJS += builtin/rebase.o
-BUILTIN_OBJS += builtin/rebase--interactive.o
BUILTIN_OBJS += builtin/receive-pack.o
BUILTIN_OBJS += builtin/reflog.o
BUILTIN_OBJS += builtin/remote.o