Merge branch 'mg/http-auth'
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:27:59 +0000 (00:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Mar 2009 07:27:59 +0000 (00:27 -0700)
* mg/http-auth:
http-push.c: use a faux remote to pass to http_init
Do not name "repo" struct "remote" in push_http.c
http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
http authentication via prompts
http_init(): Fix config file parsing
http.c: style cleanups

Conflicts:
http-push.c

No differences found