diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 13:28:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 13:28:09 +0300 |
| commit | 4f3036cfa1ffe2470f1afafe541fea8d58d9282b (patch) | |
| tree | dd4302480920e861707b1617f86a0770b7c2330a /Makefile | |
| parent | 67e3ec10d0e3a8884660105d1787322acdfc6ee5 (diff) | |
| parent | d03ebd411c651641eab823f0807705f4af65c9b1 (diff) | |
Merge branch 'ab/drop-scripted-rebase'
Retire scripted "git rebase" implementation.
* ab/drop-scripted-rebase:
rebase: remove the rebase.useBuiltin setting
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -613,7 +613,6 @@ 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-legacy-rebase.sh SCRIPT_SH += git-remote-testgit.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-stash.sh |