From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Mar 2009 07:27:59 +0000 (-0700)
Subject: Merge branch 'mg/http-auth'
X-Git-Tag: v1.6.3-rc0~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6422c6af38747f008ebffc106f9a5799b26091d0?hp=6422c6af38747f008ebffc106f9a5799b26091d0

Merge branch 'mg/http-auth'

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