summaryrefslogtreecommitdiff
path: root/builtin/difftool.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 09:03:15 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 09:03:15 +0900
commit7dab7c5b59d2b3e45ecda8cd47931db9dfc96ae2 (patch)
tree82f99132c71e2d06489d8817c8d727c3318b6c64 /builtin/difftool.c
parentMerge branch 'jk/unbreak-am-h' into maint (diff)
parentdocs/config: mention protocol implications of url.insteadOf (diff)
downloadtgif-7dab7c5b59d2b3e45ecda8cd47931db9dfc96ae2.tar.xz
Merge branch 'jk/url-insteadof-config' into maint
The interaction of "url.*.insteadOf" and custom URL scheme's whitelisting is now documented better. * jk/url-insteadof-config: docs/config: mention protocol implications of url.insteadOf
Diffstat (limited to 'builtin/difftool.c')
0 files changed, 0 insertions, 0 deletions