From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Mar 2016 19:54:17 +0000 (-0700)
Subject: Sync with Git 2.7.4
X-Git-Tag: v2.8.0-rc4~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/44915db9358936fbad21221fed3abf86166696fd?ds=inline;hp=-c

Sync with Git 2.7.4

* maint:
Git 2.7.4
Git 2.6.6
Git 2.5.5
Git 2.4.11
---

44915db9358936fbad21221fed3abf86166696fd
diff --combined Documentation/git.txt
index f9252d5591,754dc80b39..5f3647ea31
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -51,9 -51,10 +51,10 @@@ Documentation for older releases are av
    link:RelNotes/2.7.1.txt[2.7.1],
    link:RelNotes/2.7.0.txt[2.7].
  
- * link:v2.6.5/git.html[documentation for release 2.6.5]
+ * link:v2.6.6/git.html[documentation for release 2.6.6]
  
  * release notes for
+   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.3.txt[2.6.3],
@@@ -61,18 -62,20 +62,20 @@@
    link:RelNotes/2.6.1.txt[2.6.1],
    link:RelNotes/2.6.0.txt[2.6].
  
- * link:v2.5.4/git.html[documentation for release 2.5.4]
+ * link:v2.5.5/git.html[documentation for release 2.5.5]
  
  * release notes for
+   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.2.txt[2.5.2],
    link:RelNotes/2.5.1.txt[2.5.1],
    link:RelNotes/2.5.0.txt[2.5].
  
- * link:v2.4.10/git.html[documentation for release 2.4.10]
+ * link:v2.4.11/git.html[documentation for release 2.4.11]
  
  * release notes for
+   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],
    link:RelNotes/2.4.8.txt[2.4.8],
@@@ -1066,11 -1069,6 +1069,11 @@@ of clones and fetches
  	cloning of shallow repositories.
  	See 'GIT_TRACE' for available trace output options.
  
 +'GIT_TRACE_EXCLUDE'::
 +	Enables trace messages that can help debugging .gitignore
 +	processing. 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,
@@@ -1129,7 -1127,9 +1132,7 @@@
  	    connection (or proxy, if configured)
  
  	  - `ssh`: git over ssh (including `host:path` syntax,
 -	    `git+ssh://`, etc).
 -
 -	  - `rsync`: git over rsync
 +	    `ssh://`, etc).
  
  	  - `http`: git over http, both "smart http" and "dumb http".
  	    Note that this does _not_ include `https`; if you want both,