diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-07-14 09:42:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-14 09:42:24 -0700 |
commit | fc051572a3fe171286f10761bd33946c48de3f7f (patch) | |
tree | 1a87e559e6716d79983f6015c2e250591a7cc210 | |
parent | Merge branch 'jc/read-tree-cache-tree-fix' (diff) | |
download | tgif-fc051572a3fe171286f10761bd33946c48de3f7f.tar.xz |
Git 1.7.2-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/RelNotes-1.7.2.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt index 03832ff2f9..f24b3876af 100644 --- a/Documentation/RelNotes-1.7.2.txt +++ b/Documentation/RelNotes-1.7.2.txt @@ -145,8 +145,11 @@ release, unless otherwise noted. * "git reset --hard" started from a wrong directory and a working tree in a nonstandard location is in use got confused (560fb6a1). + * "git read-tree -m A B" used to switch to branch B while retaining + local changes added an incorrect cache-tree information (b1f47514). + -- exec >/var/tmp/1 -O=v1.7.2-rc1-37-g2a16315 +O=v1.7.2-rc2-17-gc9a9766 echo O=$(git describe HEAD) git shortlog --no-merges HEAD ^maint ^$O |