aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-28 14:08:50 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-28 14:08:50 -0800
commitfc4a226bf60be67bc3d574aeafe06d266f700d99 (patch)
treeb3c5bbc0c737d86604e4bb8ea6fb4d1b9f88a025 /builtin
parentf53edaf2d5983f82ffb513e10569bbfbe540613d (diff)
parent82b6803aeec62489977b98804b0a18396d3c6ebf (diff)
downloadgit-fc4a226bf60be67bc3d574aeafe06d266f700d99.tar.gz
git-fc4a226bf60be67bc3d574aeafe06d266f700d99.tar.xz
Merge branch 'ws/curl-http-proxy-over-https'
Git has been taught to support an https:// URL used for http.proxy when using recent versions of libcurl. * ws/curl-http-proxy-over-https: http: support CURLPROXY_HTTPS
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions