summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-05 09:03:15 +0900
committerJunio C Hamano <gitster@pobox.com>2017-06-05 09:03:15 +0900
commit7dab7c5b59d2b3e45ecda8cd47931db9dfc96ae2 (patch)
tree82f99132c71e2d06489d8817c8d727c3318b6c64 /contrib
parentf72e075e300cd4fb74adf61d574fd2125c37e2eb (diff)
parent2c9a2ae285b0806a5f754dcf6064f7cedc7e1fa8 (diff)
downloadgit-7dab7c5b59d2b3e45ecda8cd47931db9dfc96ae2.tar.gz
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/persistent-https/README10
1 files changed, 10 insertions, 0 deletions
diff --git a/contrib/persistent-https/README b/contrib/persistent-https/README
index f784dd2e66..7c4cd8d257 100644
--- a/contrib/persistent-https/README
+++ b/contrib/persistent-https/README
@@ -35,6 +35,16 @@ to use persistent-https:
[url "persistent-http"]
insteadof = http
+You may also want to allow the use of the persistent-https helper for
+submodule URLs (since any https URLs pointing to submodules will be
+rewritten, and Git's out-of-the-box defaults forbid submodules from
+using unknown remote helpers):
+
+[protocol "persistent-https"]
+ allow = always
+[protocol "persistent-http"]
+ allow = always
+
#####################################################################
# BUILDING FROM SOURCE