Skip to content
Browse files

GIT 1.6.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
1 parent 373a273 commit ea02eef096d4bfcbb83e76cfab0fcb42dbcad35e @gitster gitster committed Aug 17, 2008
Showing with 17 additions and 13 deletions.
  1. +11 −12 Documentation/RelNotes-1.6.0.txt
  2. +5 −0 Documentation/git.txt
  3. +1 −1 GIT-VERSION-GEN
View
23 Documentation/RelNotes-1.6.0.txt
@@ -245,15 +245,14 @@ Fixes since v1.5.6
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
- 'maint';
-
-* 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.
-
----
-exec >/var/tmp/1
-O=v1.6.0-rc3
-echo O=$(git describe refs/heads/master)
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
+ * git-clone ignored its -u option; the fix needs to be backported to
+ 'maint';
+
+ * 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-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.
+
View
5 Documentation/git.txt
@@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master'
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:RelNotes-1.6.0.txt[1.6.0].
+
* link:v1.5.6.5/git.html[documentation for release 1.5.6.5]
* release notes for
View
2 GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.6.GIT
+DEF_VER=v1.6.0.GIT
LF='
'

0 comments on commit ea02eef

Please sign in to comment.
Something went wrong with that request. Please try again.