diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-12 04:47:07 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-12 04:47:07 +0400 |
| commit | e6f1550aa569fa5773977bc2c83729f29031b39e (patch) | |
| tree | b7eb87650d0733bacd92214ee5937a27a06cf9c6 /Documentation/git.txt | |
| parent | 22fd1c84100b4c26328a8ad0c044cce2aaf8e130 (diff) | |
| parent | 8f2bbe452e2c2917ec3c9a5d1593f26908cab83b (diff) | |
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 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 7a3f03b5ce..5bb5cc830d 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -772,6 +772,14 @@ for further details. and read the password from its STDOUT. See also the 'core.askpass' option in linkgit:git-config[1]. +'GIT_CONFIG_NOSYSTEM':: + Whether to skip reading settings from the system-wide + `$(prefix)/etc/gitconfig` file. This environment variable can + be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a + predictable environment for a picky script, or you can set it + temporarily to avoid using a buggy `/etc/gitconfig` file while + waiting for someone with sufficient permissions to fix it. + 'GIT_FLUSH':: If this environment variable is set to "1", then commands such as 'git blame' (in incremental mode), 'git rev-list', 'git log', |