diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 09:55:45 +0900 |
| commit | ec8455eb2604ffba1e10bca64580fe8894541be1 (patch) | |
| tree | 7cd3f1eec3d8dd6a1aa203739fd6e1c0cb35b993 /Documentation | |
| parent | Merge branch 'ah/doc-rev-parse-short-default' (diff) | |
| parent | docs/config: mention protocol implications of url.insteadOf (diff) | |
| download | tgif-ec8455eb2604ffba1e10bca64580fe8894541be1.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 3256a33448..dd4beec39d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -3236,6 +3236,13 @@ url.<base>.insteadOf:: the best alternative for the particular user, even for a never-before-seen repository on the site. When more than one insteadOf strings match a given URL, the longest match is used. ++ +Note that any protocol restrictions will be applied to the rewritten +URL. If the rewrite changes the URL to use a custom protocol or remote +helper, you may need to adjust the `protocol.*.allow` config to permit +the request. In particular, protocols you expect to use for submodules +must be set to `always` rather than the default of `user`. See the +description of `protocol.allow` above. url.<base>.pushInsteadOf:: Any URL that starts with this value will not be pushed to; |