Merge branch 'jn/warn-on-inaccessible-loosen' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:47:07 +0000 (16:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Jan 2013 00:47:07 +0000 (16:47 -0800)
When attempting to read the XDG-style $HOME/.config/git/config and
finding that $HOME/.config/git is a file, we gave a wrong error
message, instead of treating the case as "a custom config file does
not exist there" and moving on.

* 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

1  2 
Documentation/git-config.txt
Documentation/git.txt
config.c
git-compat-util.h
wrapper.c
Simple merge
Simple merge
diff --cc config.c
Simple merge
Simple merge
diff --cc wrapper.c
Simple merge