Merge branch 'jk/url-insteadof-config'
commitec8455eb2604ffba1e10bca64580fe8894541be1
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:45 +0000 (4 09:55 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 00:55:45 +0000 (4 09:55 +0900)
tree7cd3f1eec3d8dd6a1aa203739fd6e1c0cb35b993
parent95173a566339e023666753c6382c5b3fd7484583
parent2c9a2ae285b0806a5f754dcf6064f7cedc7e1fa8
Merge branch 'jk/url-insteadof-config'

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
Documentation/config.txt