From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 04:21:52 +0000 (+0900)
Subject: Merge branch 'maint-2.9' into maint-2.10
X-Git-Tag: v2.10.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fc92b0878ccaa128e7c4505788f7c477284f0021?ds=inline;hp=-c

Merge branch 'maint-2.9' into maint-2.10
---

fc92b0878ccaa128e7c4505788f7c477284f0021
diff --combined Documentation/git.txt
index ed717e4336,80da7b7993..3cb55cdd7b
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,41 -43,40 +43,46 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.10.2/git.html[documentation for release 2.10.2]
 +
 +* release notes for
 +  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],
@@@ -86,9 -85,10 +91,10 @@@
    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],
@@@ -96,9 -96,10 +102,10 @@@
    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],
@@@ -1093,14 -1094,6 +1100,14 @@@ of clones and fetches
  	cloning of shallow repositories.
  	See `GIT_TRACE` for available trace output options.
  
 +`GIT_TRACE_CURL`::
 +	Enables a curl full trace dump of all incoming and outgoing data,
 +	including descriptive information, of the git transport protocol.
 +	This is similar to doing curl `--trace-ascii` on the command line.
 +	This option overrides setting the `GIT_CURL_VERBOSE` environment
 +	variable.
 +	See `GIT_TRACE` for available trace output options.
 +
  `GIT_LITERAL_PATHSPECS`::
  	Setting this variable to `1` will cause Git to treat all
  	pathspecs literally, rather than as glob patterns. For example,