From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 03:46:53 +0000 (+0900)
Subject: Merge branch 'maint-2.4' into maint-2.5
X-Git-Tag: v2.5.6~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/531788af951cbaf5356363f66c54594b555bdde3

Merge branch 'maint-2.4' into maint-2.5
---

531788af951cbaf5356363f66c54594b555bdde3
diff --cc Documentation/git.txt
index fe5fefe230,7f3941eee7..c64ffa81d8
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,19 -43,10 +43,20 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* 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.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],