From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 03:52:26 +0000 (+0900)
Subject: Merge branch 'maint-2.5' into maint-2.6
X-Git-Tag: v2.6.7~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab37a18b60b4f061de8239256589faeaab630ff8;p=git

Merge branch 'maint-2.5' into maint-2.6
---

ab37a18b60b4f061de8239256589faeaab630ff8
diff --cc Documentation/git.txt
index ea256de13c,55c314dbfb..9b75c50d30
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,20 -43,10 +43,21 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* 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],
 +  link:RelNotes/2.6.2.txt[2.6.2],
 +  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],