Merge branch 'kf/askpass-config'
commitb815a726e9da97924b44d551b10d3fef3b3d1885
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:01 +0000 (8 09:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:01 +0000 (8 09:17 -0700)
treea1d0fe2b25ce93d7e1e4aad225b551018d3ca22e
parente250c5914fd151caf228cbda6c30560c266bcfef
parent453842c9b81c6bb1328b0dfc351745615004a77f
Merge branch 'kf/askpass-config'

* kf/askpass-config:
  Extend documentation of core.askpass and GIT_ASKPASS.
  Allow core.askpass to override SSH_ASKPASS.
  Add a new option 'core.askpass'.
Documentation/config.txt
Documentation/git.txt
cache.h
config.c
environment.c
git.c