From: Junio C Hamano Date: Wed, 14 Dec 2011 05:44:56 +0000 (-0800) Subject: Merge branch 'maint-1.7.6' into maint-1.7.7 X-Git-Tag: v1.7.7.5~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b;p=git.git Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Git 1.7.6.5 blame: don't overflow time buffer fetch: create status table using strbuf Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes --- 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b diff --cc Documentation/git.txt index 5e80cfd71,bcedfc1a5..4a29f47b4 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -44,15 -44,10 +44,16 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.7.7.1/git.html[documentation for release 1.7.7.1] + +* release notes for + link:RelNotes/1.7.7.1.txt[1.7.7.1], + link:RelNotes/1.7.7.txt[1.7.7]. + - * link:v1.7.6.4/git.html[documentation for release 1.7.6.4] + * link:v1.7.6.5/git.html[documentation for release 1.7.6.5] * release notes for + link:RelNotes/1.7.6.5.txt[1.7.6.5], link:RelNotes/1.7.6.4.txt[1.7.6.4], link:RelNotes/1.7.6.3.txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2],