Merge branch 'jx/http-no-proxy'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 18:56:43 +0000 (10:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 18:56:43 +0000 (10:56 -0800)
* jx/http-no-proxy:
http: honor no_http env variable to bypass proxy

1  2 
http.c
diff --cc http.c
Simple merge