From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 04:31:40 +0000 (+0900)
Subject: Merge branch 'maint-2.11' into maint
X-Git-Tag: v2.12.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ebb1f6fe9d741151a737a8d509fab7339f18af63?ds=sidebyside

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

ebb1f6fe9d741151a737a8d509fab7339f18af63
diff --cc Documentation/git.txt
index 88c39d3ed5,cc215361f1..f40d6c4b19
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,16 -44,10 +44,17 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v2.11.2/git.html[documentation for release 2.11.2]
 +* link:v2.12.2/git.html[documentation for release 2.12.2]
 +
 +* release notes for
 +  link:RelNotes/2.12.2.txt[2.12.2].
 +  link:RelNotes/2.12.1.txt[2.12.1].
 +  link:RelNotes/2.12.0.txt[2.12].
 +
 +* link:v2.11.1/git.html[documentation for release 2.11.1]
  
  * release notes for
+   link:RelNotes/2.11.2.txt[2.11.2],
    link:RelNotes/2.11.1.txt[2.11.1],
    link:RelNotes/2.11.0.txt[2.11].