Skip to content

Commit 7ba06bc

Browse files
committed
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
2 parents 6cfa633 + 460bc3c commit 7ba06bc

File tree

7 files changed

+532
-511
lines changed

7 files changed

+532
-511
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,6 @@ BUILTIN_OBJS += builtin/push.o
11061106
BUILTIN_OBJS += builtin/range-diff.o
11071107
BUILTIN_OBJS += builtin/read-tree.o
11081108
BUILTIN_OBJS += builtin/rebase.o
1109-
BUILTIN_OBJS += builtin/rebase--interactive.o
11101109
BUILTIN_OBJS += builtin/receive-pack.o
11111110
BUILTIN_OBJS += builtin/reflog.o
11121111
BUILTIN_OBJS += builtin/remote.o

builtin/rebase--interactive.c

Lines changed: 0 additions & 377 deletions
This file was deleted.

0 commit comments

Comments
 (0)