summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-22 09:15:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-22 09:15:45 (GMT)
commitc0a2e1c0ba0956951b566888340e66589901b72d (patch)
tree994a98a45e458de7f83f06eb5725a0099c5be09b /Documentation
parentf97ccded3102cb1ccd5333226a9368949ccee74b (diff)
parente33d0611c0dd438ed9c1960518540c707201707a (diff)
downloadgit-c0a2e1c0ba0956951b566888340e66589901b72d.zip
git-c0a2e1c0ba0956951b566888340e66589901b72d.tar.gz
git-c0a2e1c0ba0956951b566888340e66589901b72d.tar.bz2
Merge branch 'pb/config'
* pb/config: git_config: access() returns 0 on success, not > 0 repo-config: Fix late-night bug Read configuration also from $HOME/.gitconfig Fix setting config variables with an alternative GIT_CONFIG Support for extracting configuration from different files
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-repo-config.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index d5142e0..803c0d5 100644
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -73,6 +73,18 @@ OPTIONS
List all variables set in .git/config.
+ENVIRONMENT
+-----------
+
+GIT_CONFIG::
+ Take the configuration from the given file instead of .git/config.
+
+GIT_CONFIG_LOCAL::
+ Currently the same as $GIT_CONFIG; when Git will support global
+ configuration files, this will cause it to take the configuration
+ from the global configuration file in addition to the given file.
+
+
EXAMPLE
-------