diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-14 23:54:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-14 23:54:49 +0200 |
| commit | 4bad0119f2b2f1b85a3b3d1575e097c37b1230d8 (patch) | |
| tree | fa71960da2b8c0ada9e461805bf8ff46af7d6c0d /Documentation | |
| parent | Merge branch 'cp/unit-test-reftable-pq' (diff) | |
| parent | http: do not ignore proxy path (diff) | |
| download | git-4bad0119f2b2f1b85a3b3d1575e097c37b1230d8.tar.xz git-4bad0119f2b2f1b85a3b3d1575e097c37b1230d8.zip | |
Merge branch 'rh/http-proxy-path'
The value of http.proxy can have "path" at the end for a socks
proxy that listens to a unix-domain socket, but we started to
discard it when we taught proxy auth code path to use the
credential helpers, which has been corrected.
* rh/http-proxy-path:
http: do not ignore proxy path
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/http.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt index 162b33fc52..a14371b5c9 100644 --- a/Documentation/config/http.txt +++ b/Documentation/config/http.txt @@ -5,8 +5,8 @@ http.proxy:: proxy string with a user name but no password, in which case git will attempt to acquire one in the same way it does for other credentials. See linkgit:gitcredentials[7] for more information. The syntax thus is - '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden - on a per-remote basis; see remote.<name>.proxy + '[protocol://][user[:password]@]proxyhost[:port][/path]'. This can be + overridden on a per-remote basis; see remote.<name>.proxy + Any proxy, however configured, must be completely transparent and must not modify, transform, or buffer the request or response in any way. Proxies which |