diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-02 14:24:10 -0700 |
| commit | 6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae (patch) | |
| tree | a4e4f6ec31daea1e2e21cc3654f317643493e390 /builtin/bundle.c | |
| parent | e18ace0951febce5a5fa9eeecfec4e523b1d6146 (diff) | |
| parent | 87f8a0b279def4da439b5e0e41f517a05ef110f0 (diff) | |
| download | git-6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae.tar.gz git-6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae.tar.xz | |
Merge branch 'jc/http-socks5h' into maint
The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.
* jc/http-socks5h:
http: differentiate socks5:// and socks5h://
Diffstat (limited to 'builtin/bundle.c')
0 files changed, 0 insertions, 0 deletions