Merge branch 'jk/url-insteadof-config'
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:45 +0000 (09:55 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:45 +0000 (09:55 +0900)
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

1  2 
Documentation/config.txt
Simple merge