summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-26 17:11:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-26 17:11:21 -0700
commit369ae7567a4621aa81e5c4decc27715418564ac2 (patch)
treed4dd295e54d529f1979b3290533b415326f0dcbd /Documentation
parentMerge branch 'jc/describe-misnamed-annotated-tag' (diff)
parentstash: remove the stash.useBuiltin setting (diff)
downloadtgif-369ae7567a4621aa81e5c4decc27715418564ac2.tar.xz
Merge branch 'tg/retire-scripted-stash'
"git stash" has kept an escape hatch to use the scripted version for a few releases, which got stale. It has been removed. * tg/retire-scripted-stash: stash: remove the stash.useBuiltin setting stash: get git_stash_config at the top level
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/stash.txt18
1 files changed, 5 insertions, 13 deletions
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
index abc7ef4a3a..00eb35434e 100644
--- a/Documentation/config/stash.txt
+++ b/Documentation/config/stash.txt
@@ -1,17 +1,9 @@
stash.useBuiltin::
- Set to `false` to use the legacy shell script implementation of
- linkgit:git-stash[1]. Is `true` by default, which means use
- the built-in rewrite of it in C.
-+
-The C rewrite is first included with Git version 2.22 (and Git for Windows
-version 2.19). This option serves as an escape hatch to re-enable the
-legacy version in case any bugs are found in the rewrite. This option and
-the shell script version of linkgit:git-stash[1] will be removed in some
-future release.
-+
-If you find some reason to set this option to `false`, other than
-one-off testing, you should report the behavior difference as a bug in
-Git (see https://git-scm.com/community for details).
+ Unused configuration variable. Used in Git versions 2.22 to
+ 2.26 as an escape hatch to enable the legacy shellscript
+ implementation of stash. 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.
stash.showPatch::
If this is set to true, the `git stash show` command without an