diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-06 22:11:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 22:11:16 -0800 |
| commit | 4f43e9726af5d036af96de9e5208a6122d378f9b (patch) | |
| tree | f50d3e8b91afe0ee2f45430639c2d6947d5ce651 /merge.c | |
| parent | Merge branch 'jc/apply-trailing-blank-removal' (diff) | |
| parent | config: exit on error accessing any config file (diff) | |
| download | tgif-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 'merge.c')
0 files changed, 0 insertions, 0 deletions