Skip to content

Commit ad12b81

Browse files
committed
Start 1.6.6 cycle
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9981c80 commit ad12b81

File tree

3 files changed

+62
-2
lines changed

3 files changed

+62
-2
lines changed

Documentation/RelNotes-1.6.6.txt

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
GIT v1.6.6 Release Notes
2+
========================
3+
4+
In git 1.7.0, which is planned to be the release after 1.6.6, "git
5+
push" into a branch that is currently checked out will be refused by
6+
default.
7+
8+
You can choose what should happen upon such a push by setting the
9+
configuration variable receive.denyCurrentBranch in the receiving
10+
repository.
11+
12+
Also, "git push $there :$killed" to delete the branch $killed in a remote
13+
repository $there, when $killed branch is the current branch pointed at by
14+
its HEAD, will be refused by default.
15+
16+
You can choose what should happen upon such a push by setting the
17+
configuration variable receive.denyDeleteCurrent in the receiving
18+
repository.
19+
20+
To ease the transition plan, the receiving repository of such a
21+
push running this release will issue a big warning when the
22+
configuration variable is missing. Please refer to:
23+
24+
http://git.or.cz/gitwiki/GitFaq#non-bare
25+
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
26+
27+
for more details on the reason why this change is needed and the
28+
transition plan.
29+
30+
Updates since v1.6.5
31+
--------------------
32+
33+
(subsystems)
34+
35+
(portability)
36+
37+
(performance)
38+
39+
(usability, bells and whistles)
40+
41+
* "git log --decorate" shows the location of HEAD as well.
42+
43+
(developers)
44+
45+
Fixes since v1.6.5
46+
------------------
47+
48+
All of the fixes in v1.6.5.X maintenance series are included in this
49+
release, unless otherwise noted.
50+
51+
* "git apply" and "git diff" (including patch output from "git log -p")
52+
now flags trailing blank lines as whitespace errors correctly (only
53+
"apply --whitespace=fix" stripped them but "apply --whitespace=warn"
54+
did not even warn).
55+
56+
* Two whitespace error classes, 'blank-at-eof' and 'blank-at-eol', have
57+
been introduced (settable by core.whitespace configuration variable and
58+
whitespace attribute). The 'trailing-space' whitespace error class has
59+
become a short-hand to cover both of these and there is no behaviour
60+
change for existing set-ups.

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.6.5
4+
DEF_VER=v1.6.5.GIT
55

66
LF='
77
'

RelNotes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation/RelNotes-1.6.5.txt
1+
Documentation/RelNotes-1.6.6.txt

0 commit comments

Comments
 (0)