Merge branch 'mg/http-auth' into next
commit22712876aa7f82a87f053a5fa5391783fec9d6d6
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 Mar 2009 10:53:42 +0000 (19 03:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Mar 2009 10:53:42 +0000 (19 03:53 -0700)
tree1e17109c70e8dd9cbe4691eba05437a23673be03
parent0c3257c57857423ebddd785d2ce0d33f2b69a6a4
parent44d808c238f0817fc3ae7caea8f3b625b6180e37
Merge branch 'mg/http-auth' into next

* 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

Conflicts:
http-push.c
http-push.c