Allow HTTP proxy to be overridden in config

[thirdparty/git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4124ad2970cfd76eb6592658c02007188c48003a..15745de67bb5c05f3a3454d2d985b7d04b8c899a 100644 (file)
--- 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