From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Jun 2017 00:55:45 +0000 (+0900)
Subject: Merge branch 'jk/url-insteadof-config'
X-Git-Tag: v2.14.0-rc0~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec8455eb2604ffba1e10bca64580fe8894541be1;p=git

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
---

ec8455eb2604ffba1e10bca64580fe8894541be1