Autogenerated HTML docs for v2.11.0-258-ge0580

1 files changed, 18 insertions, 39 deletions

diff --git a/git.html b/git.html
index 6c3f92173..265d9a1ce 100644
--- a/git.html
+++ b/git.html
@@ -2914,47 +2914,26 @@ of clones and fetches.</p></div>
 </dt>

 <dd>

 <p>

-        If set, provide a colon-separated list of protocols which are

-        allowed to be used with fetch/push/clone. This is useful to

-        restrict recursive submodule initialization from an untrusted

-        repository. Any protocol not mentioned will be disallowed (i.e.,

-        this is a whitelist, not a blacklist). If the variable is not

-        set at all, all protocols are enabled.  The protocol names

-        currently used by git are:

+        If set to a colon-separated list of protocols, behave as if

+        <code>protocol.allow</code> is set to <code>never</code>, and each of the listed

+        protocols has <code>protocol.&lt;name&gt;.allow</code> set to <code>always</code>

+        (overriding any existing configuration). In other words, any

+        protocol not mentioned will be disallowed (i.e., this is a

+        whitelist, not a blacklist). See the description of

+        <code>protocol.allow</code> in <a href="git-config.html">git-config(1)</a> for more details.

 </p>

-<div class="ulist"><ul>

-<li>

-<p>

-<code>file</code>: any local file-based path (including <code>file://</code> URLs,

-            or local paths)

-</p>

-</li>

-<li>

-<p>

-<code>git</code>: the anonymous git protocol over a direct TCP

-            connection (or proxy, if configured)

-</p>

-</li>

-<li>

-<p>

-<code>ssh</code>: git over ssh (including <code>host:path</code> syntax,

-            <code>ssh://</code>, etc).

-</p>

-</li>

-<li>

-<p>

-<code>http</code>: git over http, both "smart http" and "dumb http".

-            Note that this does <em>not</em> include <code>https</code>; if you want both,

-            you should specify both as <code>http:https</code>.

-</p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>GIT_PROTOCOL_FROM_USER</code>

+</dt>

+<dd>

 <p>

-any external helpers are named by their protocol (e.g., use

-            <code>hg</code> to allow the <code>git-remote-hg</code> helper)

+        Set to 0 to prevent protocols used by fetch/push/clone which are

+        configured to the <code>user</code> state.  This is useful to restrict recursive

+        submodule initialization from an untrusted repository or for programs

+        which feed potentially-untrusted URLS to git commands.  See

+        <a href="git-config.html">git-config(1)</a> for more details.

 </p>

-</li>

-</ul></div>

 </dd>

 </dl></div>

 </div>

@@ -3064,7 +3043,7 @@ subscribed to the list to send a message there.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2016-12-21 15:23:57 PST

+Last updated 2016-12-27 14:37:07 PST

 </div>

 </div>

 </body>