diff options
author | Frank Li <lznuaa@gmail.com> | 2010-03-02 19:52:11 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:15:41 -0800 |
commit | 82cd8358e8203fa02da18e8ee71449cb45c4157d (patch) | |
tree | d86e4daddec0cf6af2a69238c7e139416dfa3838 /git-merge-resolve.sh | |
parent | Merge branch 'cc/maint-bisect-paths' (diff) | |
download | tgif-82cd8358e8203fa02da18e8ee71449cb45c4157d.tar.xz |
fallback SSH_ASKPASS when GIT_ASKPASS not set
If GIT_ASKPASS is not set and SSH_ASKPASS set, GIT_ASKPASS will
use SSH_ASKPASS.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions