Updates from the list to 1.7.2 Release Notes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 2, 2010 at 10:29 UTC
16adc7cb048f9c31e80b4409aa599d485595c4e0
1 file changed
+14
-12
Documentation/RelNotes-1.7.2.txt
+14
-12
@@ -4,10 +4,13 @@ Git v1.7.2 Release Notes (draft)
4
Updates since v1.7.1
5
--------------------
6
7
- * core.eol configuration and eol attribute are the new way to control
8
- the end of line conventions for files in the working tree;
9
- core.autocrlf overrides it, keeping the traditional behaviour by
10
- default.
7
+ * core.eol configuration and text/eol attributes are the new way to control
8
+ the end of line conventions for files in the working tree.
9
+
10
+ * core.autocrlf has been made safer - it will now only handle line
11
+ endings for new files and files that are LF-only in the
12
+ repository. To normalize content that has been checked in with
13
+ CRLF, use the new eol/text attributes.
14
15
* The whitespace rules used in "git apply --whitespace" and "git diff"
16
gained a new member in the family (tab-in-indent) to help projects with
@@ -45,8 +48,12 @@ Updates since v1.7.1
48
commit.
49
50
* "git cherry-pick" learned to pick a range of commits
48
- (e.g. "cherry-pick A..B" and "cherry-pick --stdin"); this does not
49
- have nicer sequencing control "rebase [-i]" has, though.
51
+ (e.g. "cherry-pick A..B" and "cherry-pick --stdin"), so did "git
52
+ revert"; these do not support the nicer sequencing control "rebase
53
+ [-i]" has, though.
54
+
55
+ * "git cherry-pick" and "git revert" learned --strategy option to specify
56
+ the merge strategy to be used when performing three-way merges.
57
58
* "git cvsserver" can be told to use pserver; its password file can be
59
stored outside the repository.
@@ -74,7 +81,7 @@ Updates since v1.7.1
81
* Various options to "git grep" (e.g. --count, --name-only) work better
82
with binary files.
83
77
- * "git grep" learned "-Ovi" to open the files with hits in yoru editor.
84
+ * "git grep" learned "-Ovi" to open the files with hits in your editor.
85
86
* "git help -w" learned "chrome" and "chromium" browsers.
87
@@ -96,8 +103,6 @@ Updates since v1.7.1
103
104
* "git remote" learned "set-branches" subcommand.
105
99
- * "git revert" learned --strategy option to specify the merge strategy.
100
-
106
* "git rev-list A..B" learned --ancestry-path option to further limit
107
the result to the commits that are on the ancestry chain between A and
108
B (i.e. commits that are not descendants of A are excluded).
@@ -147,9 +152,6 @@ release, unless otherwise noted.
152
* "git diff" could show ambiguous abbreviation of blob object names on
153
its "index" line (3e5a188).
154
150
- * "git rebase" did not faithfully reproduce a malformed author ident, that
151
- is often seen in a repository converted from foreign SCMs (43c23251).
152
-
155
* "git reset --hard" started from a wrong directory and a working tree in
156
a nonstandard location is in use got confused (560fb6a1).
157