From: Junio C Hamano Date: Sun, 20 Dec 2009 20:15:02 +0000 (-0800) Subject: Git 1.6.6-rc4 X-Git-Tag: v1.6.6-rc4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09e5ddd756bca67552aad623bab374614ae5e60d;p=git.git Git 1.6.6-rc4 Hopefully the last rc before the final one. Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes-1.6.6.txt b/Documentation/RelNotes-1.6.6.txt index b9e864238..72df781e7 100644 --- a/Documentation/RelNotes-1.6.6.txt +++ b/Documentation/RelNotes-1.6.6.txt @@ -22,10 +22,10 @@ These changes were discussed long time ago and existing behaviours have been identified as more problematic to the userbase than keeping them for the sake of backward compatibility. -When necessary, transition strategy for existing users has been designed +When necessary, a transition strategy for existing users has been designed not to force them running around setting configuration variables and updating their scripts in order to either keep the traditional behaviour -or adjust to the new behaviour on the day their sysadmin decides to install +or adjust to the new behaviour, on the day their sysadmin decides to install the new version of git. When we switched from "git-foo" to "git foo" in 1.6.0, even though the change had been advertised and the transition guide had been provided for a very long time, the users procrastinated @@ -34,11 +34,12 @@ their sysadmins updated their git installation. We are trying to avoid repeating that unpleasantness in the 1.7.0 release. For changes decided to be in 1.7.0, commands that will be affected -have been much louder to strongly discourage such procrastination. If -you have been using recent versions of git, you would have seen -warnings issued when you exercised features whose behaviour will -change, with a clear instruction on how to keep the existing behaviour -if you want to. You hopefully are already well prepared. +have been much louder to strongly discourage such procrastination, and +they continue to be in this release. If you have been using recent +versions of git, you would have seen warnings issued when you used +features whose behaviour will change, with a clear instruction on how +to keep the existing behaviour if you want to. You hopefully are +already well prepared. Of course, we have also been giving "this and that will change in 1.7.0; prepare yourselves" warnings in the release notes and diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 039e8d427..22f246163 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.6-rc3.GIT +DEF_VER=v1.6.6-rc4.GIT LF=' '