Skip to content

Commit ea02eef

Browse files
committed
GIT 1.6.0
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 373a273 commit ea02eef

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

Documentation/RelNotes-1.6.0.txt

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,14 @@ Fixes since v1.5.6
245245
All of the fixes in v1.5.6 maintenance series are included in
246246
this release, unless otherwise noted.
247247

248-
* git-clone ignored its -u option; the fix needs to be backported to
249-
'maint';
250-
251-
* git-mv used to lose the distinction between changes that are staged
252-
and that are only in the working tree, by staging both in the index
253-
after moving such a path.
254-
255-
---
256-
exec >/var/tmp/1
257-
O=v1.6.0-rc3
258-
echo O=$(git describe refs/heads/master)
259-
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
248+
* git-clone ignored its -u option; the fix needs to be backported to
249+
'maint';
250+
251+
* git-mv used to lose the distinction between changes that are staged
252+
and that are only in the working tree, by staging both in the index
253+
after moving such a path.
254+
255+
* "git-rebase -i -p" rewrote the parents to wrong ones when amending
256+
(either edit or squash) was involved, and did not work correctly
257+
when fast forwarding.
258+

Documentation/git.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master'
4343
branch of the `git.git` repository.
4444
Documentation for older releases are available here:
4545

46+
* link:v1.6.0/git.html[documentation for release 1.6.0]
47+
48+
* release notes for
49+
link:RelNotes-1.6.0.txt[1.6.0].
50+
4651
* link:v1.5.6.5/git.html[documentation for release 1.5.6.5]
4752

4853
* release notes for

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v1.5.6.GIT
4+
DEF_VER=v1.6.0.GIT
55

66
LF='
77
'

0 commit comments

Comments
 (0)