summaryrefslogtreecommitdiffstats
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-07 07:11:16 +0100
committerJunio C Hamano <gitster@pobox.com>2013-01-07 07:11:16 +0100
commit4f43e9726af5d036af96de9e5208a6122d378f9b (patch)
treef50d3e8b91afe0ee2f45430639c2d6947d5ce651 /Documentation/git-config.txt
parentMerge branch 'jc/apply-trailing-blank-removal' (diff)
parentconfig: exit on error accessing any config file (diff)
downloadgit-4f43e9726af5d036af96de9e5208a6122d378f9b.tar.xz
git-4f43e9726af5d036af96de9e5208a6122d378f9b.zip
Merge branch 'jn/warn-on-inaccessible-loosen'
Deal with a situation where .config/git is a file and we notice .config/git/config is not readable due to ENOTDIR, not ENOENT. * jn/warn-on-inaccessible-loosen: config: exit on error accessing any config file doc: advertise GIT_CONFIG_NOSYSTEM config: treat user and xdg config permission problems as errors config, gitignore: failure to access with ENOTDIR is ok
Diffstat (limited to 'Documentation/git-config.txt')
-rw-r--r--Documentation/git-config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index eaea079165..9ae2508f3f 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -240,6 +240,10 @@ GIT_CONFIG::
Using the "--global" option forces this to ~/.gitconfig. Using the
"--system" option forces this to $(prefix)/etc/gitconfig.
+GIT_CONFIG_NOSYSTEM::
+ Whether to skip reading settings from the system-wide
+ $(prefix)/etc/gitconfig file. See linkgit:git[1] for details.
+
See also <<FILES>>.