Merge branch 'jk/credentials'
commit367d20ec6b9e8e297537f665fb528346bd0aff27
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:16 +0000 (19 16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:16 +0000 (19 16:05 -0800)
treebce97747bf55c8b3adffa0a058984aba5ea3225f
parentd16520499d2652b5b59dfb25f9cf2d56a4c6913a
parent861444f6d702b15713d0875ce9dc5aff64885fba
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
Documentation/config.txt
Makefile
git-compat-util.h
http.c
strbuf.c
strbuf.h