From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Dec 2017 22:08:50 +0000 (-0800)
Subject: Merge branch 'ws/curl-http-proxy-over-https'
X-Git-Tag: v2.16.0-rc0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc4a226bf60be67bc3d574aeafe06d266f700d99;p=thirdparty%2Fgit.git

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
---

fc4a226bf60be67bc3d574aeafe06d266f700d99