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

Merge branch 'maint-2.10' into maint-2.11
---

a849d36cf2877a1890371851710382f463290978
diff --cc Documentation/git.txt
index bdab261515,89157e2d45..2a663e5b57
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,15 -43,10 +44,16 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.11.1/git.html[documentation for release 2.11.1]
 +
 +* release notes for
 +  link:RelNotes/2.11.1.txt[2.11.1],
 +  link:RelNotes/2.11.0.txt[2.11].
 +
- * link:v2.10.2/git.html[documentation for release 2.10.2]
+ * link:v2.10.3/git.html[documentation for release 2.10.3]
  
  * release notes for
+   link:RelNotes/2.10.3.txt[2.10.3],
    link:RelNotes/2.10.2.txt[2.10.2],
    link:RelNotes/2.10.1.txt[2.10.1],
    link:RelNotes/2.10.0.txt[2.10].