Merge branch 'jx/http-no-proxy'
commitf4a48e870892b18a7205c9315821e4b6a831ade4
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 18:56:43 +0000 (10 10:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 18:56:43 +0000 (10 10:56 -0800)
tree57d3953f22d98f1fd757d9c26db4fb7b77e7d29c
parente80aae51f2be908e37fca47ea0dff6d7861c8497
parentd445fda44dbf031dccdfd384b2418ea50988a756
Merge branch 'jx/http-no-proxy'

* jx/http-no-proxy:
  http: honor no_http env variable to bypass proxy
http.c