Merge branch 'kf/askpass-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:01 +0000 (09:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 16:17:01 +0000 (09:17 -0700)
* kf/askpass-config:
Extend documentation of core.askpass and GIT_ASKPASS.
Allow core.askpass to override SSH_ASKPASS.
Add a new option 'core.askpass'.

1  2 
Documentation/config.txt
Documentation/git.txt
cache.h
config.c
environment.c
git.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc environment.c
Simple merge
diff --cc git.c
Simple merge