Merge branch 'vr/use-our-perl-in-tests'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 09675cba4a9c415dfd01d77c140f37eff2b711d7..2d6ef32a087f3f7355251a84a7d0d294f18479a5 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -97,7 +97,8 @@ OPTIONS
 
 --global::
        For writing options: write to global ~/.gitconfig file rather than
-       the repository .git/config.
+       the repository .git/config, write to $XDG_CONFIG_HOME/git/config file
+       if this file exists and the ~/.gitconfig file doesn't.
 +
 For reading options: read only from global ~/.gitconfig and from
 $XDG_CONFIG_HOME/git/config rather than from all available files.