Signed-off-by: Junio C Hamano <firstname.lastname@example.org>
diff --git a/Documentation/RelNotes-1.6.0.txt b/Documentation/RelNotes-1.6.0.txt
index 9e2e417..de7ef16 100644
@@ -245,15 +245,14 @@
All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.
-* git-clone ignored its -u option; the fix needs to be backported to
+ * git-clone ignored its -u option; the fix needs to be backported to
-* git-mv used to lose the distinction between changes that are staged
- and that are only in the working tree, by staging both in the index
- after moving such a path.
+ * git-mv used to lose the distinction between changes that are staged
+ and that are only in the working tree, by staging both in the index
+ after moving such a path.
-echo O=$(git describe refs/heads/master)
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
+ * "git-rebase -i -p" rewrote the parents to wrong ones when amending
+ (either edit or squash) was involved, and did not work correctly
+ when fast forwarding.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index b1cb972..1bc295d 100644
@@ -43,6 +43,11 @@
branch of the `git.git` repository.
Documentation for older releases are available here:
+* link:v1.6.0/git.html[documentation for release 1.6.0]
+* release notes for
* link:v184.108.40.206/git.html[documentation for release 220.127.116.11]
* release notes for
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e1290d8..156dc13 100755
@@ -1,7 +1,7 @@