diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-20 04:05:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-20 04:05:16 +0400 |
| commit | 367d20ec6b9e8e297537f665fb528346bd0aff27 (patch) | |
| tree | bce97747bf55c8b3adffa0a058984aba5ea3225f /merge-recursive.c | |
| parent | d16520499d2652b5b59dfb25f9cf2d56a4c6913a (diff) | |
| parent | 861444f6d702b15713d0875ce9dc5aff64885fba (diff) | |
Merge branch 'jk/credentials'
* jk/credentials:
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions