From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 04:05:03 +0000 (+0900)
Subject: Merge branch 'maint-2.7' into maint-2.8
X-Git-Tag: v2.8.5~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=a8d93d19a2fede14a35db163a1fd3bc87b6ac41d

Merge branch 'maint-2.7' into maint-2.8
---

a8d93d19a2fede14a35db163a1fd3bc87b6ac41d
diff --cc Documentation/git.txt
index 5a10e9b4a0,bf9b6c8c87..2cfad870fc
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,18 -43,11 +43,20 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.8.4/git.html[documentation for release 2.8.4]
 +
 +* release notes for
 +  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],