summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorLibravatar Clemens Buchacher <drizzd@aon.at>2012-03-04 17:50:43 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 21:11:06 -0800
commitb2c8c6d944722f9a4f27370f4e89d13f61243302 (patch)
tree0e4cec9567eacaec311c3fbe9409e46ecea2680a /Documentation/git-pull.txt
parentt0300: work around bug in dash 0.5.6 (diff)
downloadtgif-b2c8c6d944722f9a4f27370f4e89d13f61243302.tar.xz
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 <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions