From: Junio C Hamano Date: Wed, 20 Jan 2010 21:01:19 +0000 (-0800) Subject: Merge branch 'maint-1.6.5' into maint X-Git-Tag: v1.6.6.1~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0b0d78489407f9b934cc0d4ae83e078553acbcd;p=git.git Merge branch 'maint-1.6.5' into maint * maint-1.6.5: Git 1.6.5.8 Fix mis-backport of t7002 bash completion: factor submodules into dirty state reset: unbreak hard resets with GIT_WORK_TREE Conflicts: Documentation/git.txt GIT-VERSION-GEN RelNotes --- f0b0d78489407f9b934cc0d4ae83e078553acbcd diff --cc Documentation/git.txt index 352c23019,46558c8a4..c05efdaa6 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -43,14 -43,10 +43,15 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.6.6/git.html[documentation for release 1.6.6] + +* release notes for + link:RelNotes-1.6.6.txt[1.6.6]. + - * link:v1.6.5.7/git.html[documentation for release 1.6.5.7] + * link:v1.6.5.8/git.html[documentation for release 1.6.5.8] * release notes for + link:RelNotes-1.6.5.8.txt[1.6.5.8], link:RelNotes-1.6.5.7.txt[1.6.5.7], link:RelNotes-1.6.5.6.txt[1.6.5.6], link:RelNotes-1.6.5.5.txt[1.6.5.5],