Merge branch 'jk/url-insteadof-config' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:15 +0000 (09:03 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:03:15 +0000 (09:03 +0900)
commit7dab7c5b59d2b3e45ecda8cd47931db9dfc96ae2
tree82f99132c71e2d06489d8817c8d727c3318b6c64
parentf72e075e300cd4fb74adf61d574fd2125c37e2eb
parent2c9a2ae285b0806a5f754dcf6064f7cedc7e1fa8
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
Documentation/config.txt