aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-20 15:26:52 -0700
committerJunio C Hamano <gitster@pobox.com>2022-05-20 15:26:52 -0700
commit1256a25ecd5df8fb418a537d856bf442da984c17 (patch)
tree60b62f20d3e6fae8d36267bc7655797fe9c4a1c7 /Documentation/config
parent277cf0bc36094f6dc4297d8c9cef79df045b735d (diff)
parent756d15923bf6806f94484054873e284728a89c4b (diff)
downloadgit-1256a25ecd5df8fb418a537d856bf442da984c17.tar.xz
Merge branch 'sg/safe-directory-tests-and-docs'
New tests for the safe.directory mechanism. * sg/safe-directory-tests-and-docs: safe.directory: document and check that it's ignored in the environment t0033-safe-directory: check when 'safe.directory' is ignored t0033-safe-directory: check the error message without matching the trash dir
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/safe.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/safe.txt b/Documentation/config/safe.txt
index 6d764fe0cc..ae0e2e3bdb 100644
--- a/Documentation/config/safe.txt
+++ b/Documentation/config/safe.txt
@@ -13,8 +13,8 @@ override any such directories specified in the system config), add a
`safe.directory` entry with an empty value.
+
This config setting is only respected when specified in a system or global
-config, not when it is specified in a repository config or via the command
-line option `-c safe.directory=<path>`.
+config, not when it is specified in a repository config, via the command
+line option `-c safe.directory=<path>`, or in environment variables.
+
The value of this setting is interpolated, i.e. `~/<path>` expands to a
path relative to the home directory and `%(prefix)/<path>` expands to a