summaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-22 15:45:09 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-22 15:45:09 -0700
commit1c4f47690074de3c27c1a2124779bfe2898f295d (patch)
tree50a1b826d93dc43a8f6e4b244ebb88675dd39b4d /strbuf.h
parent33e4ec89d9aeb5f1f828fcefba8c930f4cfa0da0 (diff)
parent87f8a0b279def4da439b5e0e41f517a05ef110f0 (diff)
downloadgit-1c4f47690074de3c27c1a2124779bfe2898f295d.tar.gz
Merge branch 'jc/http-socks5h'
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 'strbuf.h')
0 files changed, 0 insertions, 0 deletions