summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Knut Franke <k.franke@science-computing.de>2010-08-30 15:40:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-31 10:49:30 -0700
commit453842c9b81c6bb1328b0dfc351745615004a77f (patch)
tree7ce52e71d6bdc8a24230d0422b8ba9baad310dc4 /git-merge-resolve.sh
parentAllow core.askpass to override SSH_ASKPASS. (diff)
downloadtgif-453842c9b81c6bb1328b0dfc351745615004a77f.tar.xz
Extend documentation of core.askpass and GIT_ASKPASS.
Signed-off-by: Knut Franke <k.franke@science-computing.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions