Merge branch 'jk/http-auth-keyring' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Aug 2011 22:25:53 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Aug 2011 22:25:53 +0000 (15:25 -0700)
commitb06e80e736fa17ec470db045b45ab3a5e6a5bd3a
tree1667b1d07fd64a301eee1ce5657a25ee6377b2c6
parent6918f69ba76adf57bdac7316743314037f0aad23
parent1e481b38ac77c9ab32a54bd419d0e60e6d5ee5d1
Merge branch 'jk/http-auth-keyring' into next

* jk/http-auth-keyring:
  credentials: add "getpass" helper
  credentials: add "store" helper
  credentials: add "cache" helper
  docs: end-user documentation for the credential subsystem
  http: use hostname in credential description
  allow the user to configure credential helpers
  look for credentials in config before prompting
  http: use credential API to get passwords
  introduce credentials API
  http: retry authentication failures for all http requests
  remote-curl: don't retry auth failures with dumb protocol
  improve httpd auth tests
  url: decode buffers that are not NUL-terminated

Conflicts:
Documentation/Makefile
Documentation/Makefile
Documentation/config.txt
Makefile
config.c
remote-curl.c