GIT 1.6.2-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Feb 7, 2009 at 11:06 UTC
621f1b4bcf40f1469fc59202248df35619e33c82
2 files changed
+58
-16
Documentation/RelNotes-1.6.2.txt
+55
-15
@@ -1,6 +1,20 @@
1
GIT v1.6.2 Release Notes
2
========================
3
4
+With the next major release, "git push" into a branch that is
5
+currently checked out will be refused by default. You can choose
6
+what should happen upon such a push by setting the configuration
7
+variable receive.denyCurrentBranch in the receiving repository.
8
+
9
+To ease the transition plan, the receiving repository of such a
10
+push running this release will issue a big warning when the
11
+configuration variable is missing. Please refer to:
12
+
13
+ http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
14
+
15
+for more details on the transition plan.
16
+
17
+
18
Updates since v1.6.1
19
--------------------
20
@@ -11,7 +25,8 @@ Updates since v1.6.1
25
* gitweb updates, including a new patch view and RSS/Atom feed
26
improvements.
27
14
-(portability)
28
+* (contrib) git.el updates for better XEmacs compatibility; vc-git.el
29
+ is not shiped with git anymore (it is part of official Emacs)
30
31
(performance)
32
@@ -22,6 +37,8 @@ Updates since v1.6.1
37
38
* automatic typo correction works on aliases as well
39
40
+* Initial support for "git notes" implemented.
41
+
42
* @{-1} is a way to refer to the last branch you were on. This is
43
accepted not only where an object name is expected, but anywhere
44
a branch name is expected. E.g. "git branch --track mybranch @{-1}"
@@ -29,12 +46,22 @@ Updates since v1.6.1
46
47
* "git add -p" learned 'g'oto action to jump directly to a hunk.
48
49
+* "git add -p" learned to find a hunk with given text with '/'.
50
+
51
+* "git add -p" optionally can be told to work with just the command letter
52
+ without Enter.
53
+
54
* when "git am" stops upon a patch that does not apply, it shows the
55
title of the offending patch.
56
57
* "git am --directory=<dir>" and "git am --reject" passes these options
58
to underlying "git apply".
59
60
+* "git am" learned --ignore-date option.
61
+
62
+* "git blame" aligns author names better when they are spelled in
63
+ non US-ASCII encoding.
64
+
65
* "git clone" now makes its best effort when cloning from an empty
66
repository to set up configuration variables to refer to the remote
67
repository.
@@ -48,6 +75,9 @@ Updates since v1.6.1
75
the commit log message it serves via gitcvs.commitmsgannotation
76
configuration.
77
78
+* "git cvsserver" learned to handle 'noop' command some CVS clients seem
79
+ to expect to work.
80
+
81
* "git diff" learned a new option --inter-hunk-context to coalesce close
82
hunks together and show context between them.
83
@@ -56,20 +86,13 @@ Updates since v1.6.1
86
87
* "git diff" learned --patience to run "patience diff" algorithm.
88
59
-* Some combinations of -b/-w/--ignore-space-at-eol to "git diff" did
60
- not work as expected.
61
-
89
* "git filter-branch" learned --prune-empty option that discards commits
90
that do not change the contents.
91
65
-* "git grep -w" and "git grep" for fixed strings have been optimized.
92
+* "git fsck" now checks loose objects in alternate object stores, instead
93
+ of misreporting them as missing.
94
67
-* "git log" and friends include HEAD to the set of starting points
68
- when --all is given. This makes a difference when you are not on
69
- any branch.
70
-
71
-* "git ls-tree" learned --full-tree option that shows the path in full
72
- regardless of where in the work tree hierarchy the command was started.
95
+* "git grep -w" and "git grep" for fixed strings have been optimized.
96
97
* "git mergetool" learned -y(--no-prompt) option to disable prompting.
98
@@ -80,7 +103,8 @@ Updates since v1.6.1
103
"git checkout" switches branches, taking the local changes while
104
switching to another commit.
105
83
-(internal)
106
+* "git tag" learned --contains that works the same way as the same option
107
+ from "git branch".
108
109
110
Fixes since v1.6.1
@@ -89,18 +113,34 @@ Fixes since v1.6.1
113
All of the fixes in v1.6.1.X maintenance series are included in this
114
release, unless otherwise noted.
115
116
+Here are fixes that this release has, but have not been backported to
117
+v1.6.1.X series.
118
+
119
* "git-add sub/file" when sub is a submodule incorrectly added the path to
120
the superproject.
121
95
-* git-bundle did not exclude annotated tags even when a range given from the
96
- command line wanted to.
122
+* "git bundle" did not exclude annotated tags even when a range given
123
+ from the command line wanted to.
124
+
125
+* "git filter-branch" unnecessarily refused to work when you had
126
+ checked out a different commit from what is recorded in the superproject
127
+ index in a submodule.
128
+
129
+* "git filter-branch" incorrectly tried to update a nonexistent work tree
130
+ at the end when it is run in a bare repository.
131
+
132
+* "git mergetool" used to ignore autocrlf and other attributes
133
+ based content rewriting.
134
135
* branch switching and merges had a silly bug that did not validate
136
the correct directory when making sure an existing subdirectory is
137
clean.
138
139
+* "git -p cmd" when cmd is not a built-in one left the display in funny state
140
+ when killed in the middle.
141
+
142
--
143
exec >/var/tmp/1
104
-O=v1.6.1.2-252-g8c95d3c
144
+O=v1.6.1.3-371-gc19923a
145
echo O=$(git describe master)
146
git shortlog --no-merges $O..master ^maint
Documentation/git.txt
+3
-1
@@ -43,9 +43,11 @@ unreleased) version of git, that is available from 'master'
43
branch of the `git.git` repository.
44
Documentation for older releases are available here:
45
46
-* link:v1.6.1.1/git.html[documentation for release 1.6.1.1]
46
+* link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
47
48
* release notes for
49
+ link:RelNotes-1.6.1.3.txt[1.6.1.3],
50
+ link:RelNotes-1.6.1.2.txt[1.6.1.2],
51
link:RelNotes-1.6.1.1.txt[1.6.1.1],
52
link:RelNotes-1.6.1.txt[1.6.1].
53