Merge branch 'maint-2.11' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 May 2017 04:31:40 +0000 (13:31 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 May 2017 04:31:40 +0000 (13:31 +0900)
1  2 
Documentation/git.txt
diff --combined Documentation/git.txt
index 88c39d3ed5d5239ffd485711d01d51e546dedde6,cc215361f130f197df8655584a8b6e768dced475..f40d6c4b194fc6f24e9105ee0d109ed760ae6d42
@@@ -44,54 -44,54 +44,61 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v2.11.2/git.html[documentation for release 2.11.2]
 +* link:v2.12.2/git.html[documentation for release 2.12.2]
 +
 +* release notes for
 +  link:RelNotes/2.12.2.txt[2.12.2].
 +  link:RelNotes/2.12.1.txt[2.12.1].
 +  link:RelNotes/2.12.0.txt[2.12].
 +
 +* link:v2.11.1/git.html[documentation for release 2.11.1]
  
  * release notes for
+   link:RelNotes/2.11.2.txt[2.11.2],
    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]
+ * link:v2.10.3/git.html[documentation for release 2.10.3]
  
  * release notes for
+   link:RelNotes/2.10.3.txt[2.10.3],
    link:RelNotes/2.10.2.txt[2.10.2],
    link:RelNotes/2.10.1.txt[2.10.1],
    link:RelNotes/2.10.0.txt[2.10].
  
- * link:v2.9.3/git.html[documentation for release 2.9.3]
+ * link:v2.9.4/git.html[documentation for release 2.9.4]
  
  * release notes for
+   link:RelNotes/2.9.4.txt[2.9.4],
    link:RelNotes/2.9.3.txt[2.9.3],
    link:RelNotes/2.9.2.txt[2.9.2],
    link:RelNotes/2.9.1.txt[2.9.1],
    link:RelNotes/2.9.0.txt[2.9].
  
- * link:v2.8.4/git.html[documentation for release 2.8.4]
+ * link:v2.8.5/git.html[documentation for release 2.8.5]
  
  * release notes for
+   link:RelNotes/2.8.5.txt[2.8.5],
    link:RelNotes/2.8.4.txt[2.8.4],
    link:RelNotes/2.8.3.txt[2.8.3],
    link:RelNotes/2.8.2.txt[2.8.2],
    link:RelNotes/2.8.1.txt[2.8.1],
    link:RelNotes/2.8.0.txt[2.8].
  
- * link:v2.7.3/git.html[documentation for release 2.7.3]
+ * link:v2.7.5/git.html[documentation for release 2.7.5]
  
  * release notes for
+   link:RelNotes/2.7.5.txt[2.7.5],
+   link:RelNotes/2.7.4.txt[2.7.4],
    link:RelNotes/2.7.3.txt[2.7.3],
    link:RelNotes/2.7.2.txt[2.7.2],
    link:RelNotes/2.7.1.txt[2.7.1],
    link:RelNotes/2.7.0.txt[2.7].
  
- * link:v2.6.6/git.html[documentation for release 2.6.6]
+ * link:v2.6.7/git.html[documentation for release 2.6.7]
  
  * release notes for
+   link:RelNotes/2.6.7.txt[2.6.7],
    link:RelNotes/2.6.6.txt[2.6.6],
    link:RelNotes/2.6.5.txt[2.6.5],
    link:RelNotes/2.6.4.txt[2.6.4],
    link:RelNotes/2.6.1.txt[2.6.1],
    link:RelNotes/2.6.0.txt[2.6].
  
- * link:v2.5.5/git.html[documentation for release 2.5.5]
+ * link:v2.5.6/git.html[documentation for release 2.5.6]
  
  * release notes for
+   link:RelNotes/2.5.6.txt[2.5.6],
    link:RelNotes/2.5.5.txt[2.5.5],
    link:RelNotes/2.5.4.txt[2.5.4],
    link:RelNotes/2.5.3.txt[2.5.3],
    link:RelNotes/2.5.1.txt[2.5.1],
    link:RelNotes/2.5.0.txt[2.5].
  
- * link:v2.4.11/git.html[documentation for release 2.4.11]
+ * link:v2.4.12/git.html[documentation for release 2.4.12]
  
  * release notes for
+   link:RelNotes/2.4.12.txt[2.4.12],
    link:RelNotes/2.4.11.txt[2.4.11],
    link:RelNotes/2.4.10.txt[2.4.10],
    link:RelNotes/2.4.9.txt[2.4.9],
@@@ -1169,20 -1171,30 +1178,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]]
  ------------------------