diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:40 (GMT) |
| commit | ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0 (patch) | |
| tree | b28ec107bf91e7c460c1fafac96cc9d7208217ed /Makefile | |
| parent | 0d107b19890db191c9281bff67180389fb53df24 (diff) | |
| parent | 082ef75b7bfc90ac236afbb857a9552a026832b8 (diff) | |
| download | git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.zip git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.gz git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.bz2 | |
Merge branch 'js/rebase-cleanup'
Update supporting parts of "git rebase" to remove code that should
no longer be used.
* js/rebase-cleanup:
rebase: fold git-rebase--common into the -p backend
sequencer: the `am` and `rebase--interactive` scripts are gone
.gitignore: there is no longer a built-in `git-rebase--interactive`
t3400: stop referring to the scripted rebase
Drop unused git-rebase--am.sh
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -624,8 +624,6 @@ 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--preserve-merges SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-i18n |