summaryrefslogtreecommitdiff
path: root/Documentation/git-repo-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-18 21:48:32 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-18 21:48:32 -0700
commit42d504248830452275dbe1c864f0b1771d7b1a05 (patch)
tree011c7f094bfcdd41f510461c720485c8fbf1791e /Documentation/git-repo-config.txt
parentMerge branch 'master' into next (diff)
parentSupport for extracting configuration from different files (diff)
downloadtgif-42d504248830452275dbe1c864f0b1771d7b1a05.tar.xz
Merge branch 'pb/config' into next
* pb/config: Support for extracting configuration from different files Fix PPC SHA1 routine for large input buffers Make t8001-annotate and t8002-blame more portable Remove "refs" field from "struct object" Make release tarballs friendlier to older tar versions
Diffstat (limited to 'Documentation/git-repo-config.txt')
-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 d5142e0dcd..803c0d5cae 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
-------