From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Oct 2009 07:11:43 +0000 (-0700)
Subject: Start 1.6.6 cycle
X-Git-Tag: v1.6.6-rc0~124
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad12b81271d76f3e4a8b1f527e252ac8452732fd;p=git.git

Start 1.6.6 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes-1.6.6.txt b/Documentation/RelNotes-1.6.6.txt
new file mode 100644
index 000000000..5f1fecb5e
--- /dev/null
+++ b/Documentation/RelNotes-1.6.6.txt
@@ -0,0 +1,60 @@
+GIT v1.6.6 Release Notes
+========================
+
+In git 1.7.0, which is planned to be the release after 1.6.6, "git
+push" into a branch that is currently checked out will be refused by
+default.
+
+You can choose what should happen upon such a push by setting the
+configuration variable receive.denyCurrentBranch in the receiving
+repository.
+
+Also, "git push $there :$killed" to delete the branch $killed in a remote
+repository $there, when $killed branch is the current branch pointed at by
+its HEAD, will be refused by default.
+
+You can choose what should happen upon such a push by setting the
+configuration variable receive.denyDeleteCurrent in the receiving
+repository.
+
+To ease the transition plan, the receiving repository of such a
+push running this release will issue a big warning when the
+configuration variable is missing.  Please refer to:
+
+  http://git.or.cz/gitwiki/GitFaq#non-bare
+  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+
+for more details on the reason why this change is needed and the
+transition plan.
+
+Updates since v1.6.5
+--------------------
+
+(subsystems)
+
+(portability)
+
+(performance)
+
+(usability, bells and whistles)
+
+ * "git log --decorate" shows the location of HEAD as well.
+
+(developers)
+
+Fixes since v1.6.5
+------------------
+
+All of the fixes in v1.6.5.X maintenance series are included in this
+release, unless otherwise noted.
+
+ * "git apply" and "git diff" (including patch output from "git log -p")
+   now flags trailing blank lines as whitespace errors correctly (only
+   "apply --whitespace=fix" stripped them but "apply --whitespace=warn"
+   did not even warn).
+
+ * Two whitespace error classes, 'blank-at-eof' and 'blank-at-eol', have
+   been introduced (settable by core.whitespace configuration variable and
+   whitespace attribute).  The 'trailing-space' whitespace error class has
+   become a short-hand to cover both of these and there is no behaviour
+   change for existing set-ups.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 08e6073f3..710d36123 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.5
+DEF_VER=v1.6.5.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index b62449d2e..5274ceed4 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.5.txt
\ No newline at end of file
+Documentation/RelNotes-1.6.6.txt
\ No newline at end of file