![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Mar 2009 07:27:59 +0000 (00:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Mar 2009 07:27:59 +0000 (00:27 -0700) | ||
| commit | 6422c6af38747f008ebffc106f9a5799b26091d0 | |
| tree | 09aaa6f6399c72242022144cf988c42ee4dd71c9 | tree | snapshot |
| parent | f504fa2acbd67b28e9e91ee6cd1f2d1a26d96128 | commit | diff |
| parent | 44d808c238f0817fc3ae7caea8f3b625b6180e37 | commit | diff |
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
* 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
| http-push.c | diff1 | | diff2 | | blob | history |