diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:21:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-04 22:21:52 -0800 |
| commit | 91527e54d565e6fb6910fb3cb22f5915b5bd346e (patch) | |
| tree | d86ee11ed880f6776cc192cbd1fec25e77064e22 /Documentation/config.txt | |
| parent | 38916c5b4740f6db09dc140a84bb470dfb582366 (diff) | |
| parent | ead8eb8c1092ce2d94d70872946829a7a946ae9d (diff) | |
| download | git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.tar.gz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.9.3 for the last time
http.proxy: also mention https_proxy and all_proxy
t0300: work around bug in dash 0.5.6
t5512 (ls-remote): modernize style
tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5367ba9cae..c081657be7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1275,9 +1275,10 @@ help.autocorrect:: This is the default. http.proxy:: - Override the HTTP proxy, normally configured using the 'http_proxy' - environment variable (see linkgit:curl[1]). This can be overridden - on a per-remote basis; see remote.<name>.proxy + Override the HTTP proxy, normally configured using the 'http_proxy', + 'https_proxy', and 'all_proxy' environment variables (see + `curl(1)`). This can be overridden on a per-remote basis; see + remote.<name>.proxy http.cookiefile:: File containing previously stored cookie lines which should be used |