Skip to content

Commit

Permalink
Merge branch 'mg/http-auth'
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
Junio C Hamano committed Mar 26, 2009
2 parents f504fa2 + 44d808c commit 6422c6a
Show file tree
Hide file tree
Showing 2 changed files with 190 additions and 141 deletions.
Loading

0 comments on commit 6422c6a

Please sign in to comment.