diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-17 15:30:37 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-19 17:32:10 +0900 |
| commit | 0609b741a43dee2934ceb76850fea5963ab0c8f6 (patch) | |
| tree | 7cc5de52ce750efec4e53b9bf3c76fe397c269b3 /Makefile | |
| parent | rebase: use OPT_RERERE_AUTOUPDATE() (diff) | |
| download | tgif-0609b741a43dee2934ceb76850fea5963ab0c8f6.tar.xz | |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1130,7 +1130,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 |