From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 04:13:48 +0000 (+0900)
Subject: Merge branch 'maint-2.8' into maint-2.9
X-Git-Tag: v2.9.4~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c93ab42b7480a2c317713385f5ef3f8f2b099c2b

Merge branch 'maint-2.8' into maint-2.9
---

c93ab42b7480a2c317713385f5ef3f8f2b099c2b
diff --cc Documentation/git.txt
index 923aa49db7,8fdb0c8c23..cfe4570b51
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,17 -43,10 +43,18 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.9.3/git.html[documentation for release 2.9.3]
 +
 +* release notes for
 +  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],