OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e18ace0
87f8a0b
)
Merge branch 'jc/http-socks5h' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 2 May 2016 21:24:10 +0000
(14:24 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 2 May 2016 21:24:10 +0000
(14:24 -0700)
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://
1
2
http.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
http.c
Simple merge