diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-03-23 16:23:58 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-23 14:05:58 -0700 |
| commit | 9bcde4d53143f0b74604fa012c703f3794f94f80 (patch) | |
| tree | f7d611e0002d6fc315b57a93e697235f0bbc9874 /Documentation/config/rebase.txt | |
| parent | The second batch (diff) | |
| download | tgif-9bcde4d53143f0b74604fa012c703f3794f94f80.tar.xz | |
rebase: remove transitory rebase.useBuiltin setting & env
Remove the rebase.useBuiltin setting and the now-obsolete
GIT_TEST_REBASE_USE_BUILTIN test flag.
This was left in place after my d03ebd411c6 (rebase: remove the
rebase.useBuiltin setting, 2019-03-18) to help anyone who'd used the
experimental flag and wanted to know that it was the default, or that
they should transition their test environment to use the builtin
rebase unconditionally.
It's been more than long enough for those users to get a headsup about
this. So remove all the scaffolding that was left inplace after
d03ebd411c6. I'm also removing the documentation entry, if anyone
still has this left in their configuration they can do some source
archaeology to figure out what it used to do, which makes more sense
than exposing every git user reading the documentation to this legacy
configuration switch.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/rebase.txt')
| -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 |