summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-08 09:17:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-08 09:17:01 -0700
commitb815a726e9da97924b44d551b10d3fef3b3d1885 (patch)
treea1d0fe2b25ce93d7e1e4aad225b551018d3ca22e /combine-diff.c
parentMerge branch 'bc/maint-fetch-url-only' (diff)
parentExtend documentation of core.askpass and GIT_ASKPASS. (diff)
downloadtgif-b815a726e9da97924b44d551b10d3fef3b3d1885.tar.xz
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'.
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions