From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 03:59:16 +0000 (+0900)
Subject: Merge branch 'maint-2.6' into maint-2.7
X-Git-Tag: v2.7.5~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dc58c8554ab9ca8ae12944ce5a311a39d93835eb

Merge branch 'maint-2.6' into maint-2.7
---

dc58c8554ab9ca8ae12944ce5a311a39d93835eb
diff --cc Documentation/git.txt
index 754dc80b39,64ac7b255f..4b324c8f5e
--- 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.7.3/git.html[documentation for release 2.7.3]
 +
 +* release notes for
 +  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],
 +  link:RelNotes/2.7.0.txt[2.7].
 +
- * link:v2.6.6/git.html[documentation for release 2.6.6]
+ * link:v2.6.7/git.html[documentation for release 2.6.7]
  
  * release notes for
+   link:RelNotes/2.6.7.txt[2.6.7],
    link:RelNotes/2.6.6.txt[2.6.6],
    link:RelNotes/2.6.5.txt[2.6.5],
    link:RelNotes/2.6.4.txt[2.6.4],