summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Emil Sit <sit@emilsit.net>2009-03-17 13:31:42 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-17 16:22:06 -0700
commit642d0844b9795ca7b1424f4afc8d8c86abd7bf34 (patch)
tree9b86a3bd0df0acd3ec690eb4d7ea2cecc7e1d3a7 /Documentation/config.txt
parentls-files: require worktree when --deleted is given (diff)
downloadtgif-642d0844b9795ca7b1424f4afc8d8c86abd7bf34.tar.xz
config.txt: Describe special 'none' handling in core.gitProxy.
Signed-off-by: Emil Sit <sit@emilsit.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 70fd172c6b..44916b9e7f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -221,6 +221,11 @@ core.gitProxy::
Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
(which always applies universally, without the special "for"
handling).
++
+The special string `none` can be used as the proxy command to
+specify that no proxy be used for a given domain pattern.
+This is useful for excluding servers inside a firewall from
+proxy use, while defaulting to a common proxy for external domains.
core.ignoreStat::
If true, commands which modify both the working tree and the index