summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-11 16:47:07 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-11 16:47:07 -0800
commite6f1550aa569fa5773977bc2c83729f29031b39e (patch)
treeb7eb87650d0733bacd92214ee5937a27a06cf9c6 /git-difftool--helper.sh
parent22fd1c84100b4c26328a8ad0c044cce2aaf8e130 (diff)
parent8f2bbe452e2c2917ec3c9a5d1593f26908cab83b (diff)
downloadgit-e6f1550aa569fa5773977bc2c83729f29031b39e.tar.gz
Merge branch 'jn/warn-on-inaccessible-loosen' into maint
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
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions