diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:52 (GMT) |
| commit | 5ae50845d8a30d7db32e139ce04b712f9deb99cd (patch) | |
| tree | 0b01b1bf5c765b894c5ab6482f143b318f5729bb /Makefile | |
| parent | 4ede3d42dfb57f9a41ac96a1f216c62eb7566cc2 (diff) | |
| parent | ac7f467fef8b836084afdce5eded047c79a6858d (diff) | |
| download | git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.zip git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.tar.gz git-5ae50845d8a30d7db32e139ce04b712f9deb99cd.tar.bz2 | |
Merge branch 'pk/rebase-in-c'
Rewrite of the "rebase" machinery in C.
* pk/rebase-in-c:
builtin/rebase: support running "git rebase <upstream>"
rebase: refactor common shell functions into their own file
rebase: start implementing it as a builtin
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -616,7 +616,7 @@ SCRIPT_SH += git-merge-one-file.sh SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-quiltimport.sh -SCRIPT_SH += git-rebase.sh +SCRIPT_SH += git-legacy-rebase.sh SCRIPT_SH += git-remote-testgit.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-stash.sh @@ -626,6 +626,7 @@ SCRIPT_SH += git-web--browse.sh SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-rebase--am +SCRIPT_LIB += git-rebase--common SCRIPT_LIB += git-rebase--interactive SCRIPT_LIB += git-rebase--preserve-merges SCRIPT_LIB += git-rebase--merge @@ -1093,6 +1094,7 @@ BUILTIN_OBJS += builtin/pull.o 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--helper.o BUILTIN_OBJS += builtin/receive-pack.o BUILTIN_OBJS += builtin/reflog.o |