summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorSam Vilain <sam.vilain@catalyst.net.nz>2007-11-23 00:07:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-04 06:11:53 (GMT)
commit9c5665aa3c938b0e085ca34a8126110edcffa217 (patch)
treeb10f88b086253d085215cbfef72cff07b685339f /Documentation/config.txt
parentb319ce4c14f7fe0ee469a3f9def1098d84177849 (diff)
downloadgit-9c5665aa3c938b0e085ca34a8126110edcffa217.zip
git-9c5665aa3c938b0e085ca34a8126110edcffa217.tar.gz
git-9c5665aa3c938b0e085ca34a8126110edcffa217.tar.bz2
Allow HTTP proxy to be overridden in config
The http_proxy / HTTPS_PROXY variables used by curl to control proxying may not be suitable for git. Allow the user to override them in the configuration file. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4124ad2..15745de 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -550,6 +550,10 @@ specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
is one of "ext" and "pserver") to make them apply only for the given
access method.
+http.proxy::
+ Override the HTTP proxy, normally configured using the 'http_proxy'
+ environment variable (see gitlink:curl[1]).
+
http.sslVerify::
Whether to verify the SSL certificate when fetching or pushing
over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment