diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:47:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 16:47:07 -0800 |
| commit | e6f1550aa569fa5773977bc2c83729f29031b39e (patch) | |
| tree | b7eb87650d0733bacd92214ee5937a27a06cf9c6 /Documentation | |
| parent | Merge branch 'ja/directory-attrs' into maint (diff) | |
| parent | config: exit on error accessing any config file (diff) | |
| download | tgif-e6f1550aa569fa5773977bc2c83729f29031b39e.tar.xz | |
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')
| -rw-r--r-- | Documentation/git-config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git.txt | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index eaea079165..9ae2508f3f 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -240,6 +240,10 @@ GIT_CONFIG:: Using the "--global" option forces this to ~/.gitconfig. Using the "--system" option forces this to $(prefix)/etc/gitconfig. +GIT_CONFIG_NOSYSTEM:: + Whether to skip reading settings from the system-wide + $(prefix)/etc/gitconfig file. See linkgit:git[1] for details. + See also <<FILES>>. 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', |