Skip to content

Commit b2c8c6d

Browse files
Clemens Buchachergitster
authored andcommitted
http.proxy: also mention https_proxy and all_proxy
The current wording of the http.proxy documentation suggests that http_proxy is somehow equivalent to http.proxy. However, while http.proxy (by the means of curl's CURLOPT_PROXY option) overrides the proxy for both HTTP and HTTPS protocols, the http_proxy environment variable is used only for HTTP. But since the docs mention only http_proxy, a user might expect it to apply to all HTTP-like protocols. Avoid any such misunderstanding by explicitly mentioning https_proxy and all_proxy as well. Also replace linkgit:curl[1] with a literal 'curl(1)', because the former gets translated to a dead link in the HTML pages. Signed-off-by: Clemens Buchacher <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 78ed1d2 commit b2c8c6d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Documentation/config.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,9 +1260,10 @@ help.autocorrect::
12601260
This is the default.
12611261

12621262
http.proxy::
1263-
Override the HTTP proxy, normally configured using the 'http_proxy'
1264-
environment variable (see linkgit:curl[1]). This can be overridden
1265-
on a per-remote basis; see remote.<name>.proxy
1263+
Override the HTTP proxy, normally configured using the 'http_proxy',
1264+
'https_proxy', and 'all_proxy' environment variables (see
1265+
`curl(1)`). This can be overridden on a per-remote basis; see
1266+
remote.<name>.proxy
12661267

12671268
http.cookiefile::
12681269
File containing previously stored cookie lines which should be used

0 commit comments

Comments
 (0)