summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-06 22:11:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-06 22:11:16 -0800
commit4f43e9726af5d036af96de9e5208a6122d378f9b (patch)
treef50d3e8b91afe0ee2f45430639c2d6947d5ce651 /Documentation/merge-config.txt
parentMerge branch 'jc/apply-trailing-blank-removal' (diff)
parentconfig: exit on error accessing any config file (diff)
downloadtgif-4f43e9726af5d036af96de9e5208a6122d378f9b.tar.xz
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/merge-config.txt')
0 files changed, 0 insertions, 0 deletions