diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-30 14:35:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-30 14:35:37 -0700 |
| commit | dc2a073036ccbd3d8aa707b98e996b6fb9bcd751 (patch) | |
| tree | af8333a906f2bacf22659affd0e51965b2b658bb /Documentation | |
| parent | 501380286295cac300dae86c3f0f6c10ff34b767 (diff) | |
| parent | 9bcde4d53143f0b74604fa012c703f3794f94f80 (diff) | |
| download | git-dc2a073036ccbd3d8aa707b98e996b6fb9bcd751.tar.xz | |
Merge branch 'ab/remove-rebase-usebuiltin'
Remove the final hint that we used to have a scripted "git rebase".
* ab/remove-rebase-usebuiltin:
rebase: remove transitory rebase.useBuiltin setting & env
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/rebase.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index 214f31b451..8c979cb20f 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -1,10 +1,3 @@ -rebase.useBuiltin:: - Unused configuration variable. Used in Git versions 2.20 and - 2.21 as an escape hatch to enable the legacy shellscript - implementation of rebase. Now the built-in rewrite of it in C - is always used. Setting this will emit a warning, to alert any - remaining users that setting this now does nothing. - rebase.backend:: Default backend to use for rebasing. Possible choices are 'apply' or 'merge'. In the future, if the merge backend gains |