summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorSam Vilain <sam.vilain@catalyst.net.nz>2007-12-03 21:48:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-04 07:43:07 (GMT)
commit14c98218845ad2acbd42b8d913503ff6fb3fd2ac (patch)
tree80727a8ed62317aa7602f5cbcc117e7d3a3de211 /Documentation/config.txt
parent9c5665aa3c938b0e085ca34a8126110edcffa217 (diff)
downloadgit-14c98218845ad2acbd42b8d913503ff6fb3fd2ac.zip
git-14c98218845ad2acbd42b8d913503ff6fb3fd2ac.tar.gz
git-14c98218845ad2acbd42b8d913503ff6fb3fd2ac.tar.bz2
Add remote.<name>.proxy
As well as allowing a default http.proxy option, allow it to be set per-remote. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 15745de..6ae1184 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -552,7 +552,8 @@ access method.
http.proxy::
Override the HTTP proxy, normally configured using the 'http_proxy'
- environment variable (see gitlink:curl[1]).
+ environment variable (see gitlink:curl[1]). This can be overridden
+ on a per-remote basis; see remote.<name>.proxy
http.sslVerify::
Whether to verify the SSL certificate when fetching or pushing
@@ -702,6 +703,11 @@ remote.<name>.url::
The URL of a remote repository. See gitlink:git-fetch[1] or
gitlink:git-push[1].
+remote.<name>.proxy::
+ For remotes that require curl (http, https and ftp), the URL to
+ the proxy to use for that remote. Set to the empty string to
+ disable proxying for that remote.
+
remote.<name>.fetch::
The default set of "refspec" for gitlink:git-fetch[1]. See
gitlink:git-fetch[1].