Skip to content

Commit 0609b74

Browse files
phillipwoodgitster
authored andcommitted
rebase -i: combine rebase--interactive.c with rebase.c
In order to run `rebase -i` without forking `rebase--interactive` it will be convenient to have all the code from rebase--interactive.c in rebase.c. This is a straight forward copy of the code from rebase--interactive.c, it will be simplified slightly in the next commit. Signed-off-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6023c92 commit 0609b74

File tree

3 files changed

+367
-378
lines changed

3 files changed

+367
-378
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ BUILTIN_OBJS += builtin/push.o
11301130
BUILTIN_OBJS += builtin/range-diff.o
11311131
BUILTIN_OBJS += builtin/read-tree.o
11321132
BUILTIN_OBJS += builtin/rebase.o
1133-
BUILTIN_OBJS += builtin/rebase--interactive.o
11341133
BUILTIN_OBJS += builtin/receive-pack.o
11351134
BUILTIN_OBJS += builtin/reflog.o
11361135
BUILTIN_OBJS += builtin/remote.o

builtin/rebase--interactive.c

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

0 commit comments

Comments
 (0)