| commit | 7a6d658aa3c9016dd04ff3515cbf15edca6562a4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Dec 2011 00:11:36 +0000 (12 16:11 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Dec 2011 00:11:36 +0000 (12 16:11 -0800) | ||
| tree | a53f95fa379acb2cd587dd5e1ab6cf521b9e2ae7 | treesnapshot (tar.gz zip) |
| parent | 74ef5085448ea199590fb39002bbca8fb32ba539 | commitdiff |
| parent | 861444f6d702b15713d0875ce9dc5aff64885fba | commitdiff |
Merge branch 'jk/credentials' (early part) into next
* 'jk/credentials' (early part):
t: add test harness for external credential helpers
credentials: add "store" helper
strbuf: add strbuf_add*_urlencode
Makefile: unix sockets may not available on some platforms
credentials: add "cache" helper
docs: end-user documentation for the credential subsystem
credential: make relevance of http path configurable
credential: add credential.*.username
credential: apply helper config
http: use credential API to get passwords
credential: add function for parsing url components
introduce credentials API
t5550: fix typo
test-lib: add test_config_global variant
Conflicts:
strbuf.c
* 'jk/credentials' (early part):
t: add test harness for external credential helpers
credentials: add "store" helper
strbuf: add strbuf_add*_urlencode
Makefile: unix sockets may not available on some platforms
credentials: add "cache" helper
docs: end-user documentation for the credential subsystem
credential: make relevance of http path configurable
credential: add credential.*.username
credential: apply helper config
http: use credential API to get passwords
credential: add function for parsing url components
introduce credentials API
t5550: fix typo
test-lib: add test_config_global variant
Conflicts:
strbuf.c