diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-27 21:57:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-27 21:57:14 (GMT) |
| commit | 098ed50e8a7c581e23cd51b737fb780228fe6f31 (patch) | |
| tree | 708d472f3b40ea250e0c14d28005487614e91ada /Makefile | |
| parent | a04855bae8d75d22b0c909c7d1febedcd05ba9b1 (diff) | |
| parent | 18633e1a22a68bbe8e6311a1039d13ebbf6fd041 (diff) | |
| download | git-098ed50e8a7c581e23cd51b737fb780228fe6f31.zip git-098ed50e8a7c581e23cd51b737fb780228fe6f31.tar.gz git-098ed50e8a7c581e23cd51b737fb780228fe6f31.tar.bz2 | |
Merge branch 'js/rebase-helper'
"git rebase -i" starts using the recently updated "sequencer" code.
* js/rebase-helper:
rebase -i: use the rebase--helper builtin
rebase--helper: add a builtin helper for interactive rebases
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -933,6 +933,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--helper.o BUILTIN_OBJS += builtin/receive-pack.o BUILTIN_OBJS += builtin/reflog.o BUILTIN_OBJS += builtin/remote.o |