From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:20:01 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v2.12.0-rc0~79
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/733671b0fd2fb03edb05273f36ec70bd624e544f?ds=inline;hp=-c

Merge branch 'maint'
---

733671b0fd2fb03edb05273f36ec70bd624e544f
diff --combined Documentation/git.txt
index ba222f68cc,bdab261515..4f208fab92
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,9 -44,10 +44,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.11.0/git.html[documentation for release 2.11]
+ * link:v2.11.1/git.html[documentation for release 2.11.1]
  
  * release notes for
+   link:RelNotes/2.11.1.txt[2.11.1],
    link:RelNotes/2.11.0.txt[2.11].
  
  * link:v2.10.2/git.html[documentation for release 2.10.2]
@@@ -1161,20 -1162,30 +1162,20 @@@ of clones and fetches
  	cloning a repository to make a backup).
  
  `GIT_ALLOW_PROTOCOL`::
 -	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:
 -
 -	  - `file`: any local file-based path (including `file://` URLs,
 -	    or local paths)
 -
 -	  - `git`: the anonymous git protocol over a direct TCP
 -	    connection (or proxy, if configured)
 -
 -	  - `ssh`: git over ssh (including `host:path` syntax,
 -	    `ssh://`, etc).
 -
 -	  - `http`: git over http, both "smart http" and "dumb http".
 -	    Note that this does _not_ include `https`; if you want both,
 -	    you should specify both as `http:https`.
 -
 -	  - any external helpers are named by their protocol (e.g., use
 -	    `hg` to allow the `git-remote-hg` helper)
 -
 +	If set to a colon-separated list of protocols, behave as if
 +	`protocol.allow` is set to `never`, and each of the listed
 +	protocols has `protocol.<name>.allow` set to `always`
 +	(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
 +	`protocol.allow` in linkgit:git-config[1] for more details.
 +
 +`GIT_PROTOCOL_FROM_USER`::
 +	Set to 0 to prevent protocols used by fetch/push/clone which are
 +	configured to the `user` 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
 +	linkgit:git-config[1] for more details.
  
  Discussion[[Discussion]]
  ------------------------