Skip to content

Commit

Permalink
Start 1.6.6 cycle
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Oct 17, 2009
1 parent 9981c80 commit ad12b81
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 2 deletions.
60 changes: 60 additions & 0 deletions Documentation/RelNotes-1.6.6.txt
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.6.5
DEF_VER=v1.6.5.GIT

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion RelNotes

0 comments on commit ad12b81

Please sign in to comment.