diff options
| -rw-r--r-- | Documentation/RelNotes-1.6.0.txt | 23 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 17 insertions, 13 deletions
diff --git a/Documentation/RelNotes-1.6.0.txt b/Documentation/RelNotes-1.6.0.txt index 9e2e417ef7..de7ef166b6 100644 --- a/Documentation/RelNotes-1.6.0.txt +++ b/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. + diff --git a/Documentation/git.txt b/Documentation/git.txt index b1cb972369..1bc295dd54 100644 --- a/Documentation/git.txt +++ b/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 diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e1290d8901..156dc13733 100755 --- a/GIT-VERSION-GEN +++ b/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=' ' |