summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-17 10:18:59 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-17 11:31:40 -0700
commit07d1a42badf5a29b030f9d1c4c8dd1ff9fdc8a91 (patch)
treeec166a176d70d04e417ad09373345de2f408cd32
parent07c92928f2b782330df6e78dd9d019e984d820a7 (diff)
downloadgit-07d1a42badf5a29b030f9d1c4c8dd1ff9fdc8a91.tar.gz
relnotes: redo the description of text=auto fix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.10.0.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
index 179e5751d8..f4e6a68510 100644
--- a/Documentation/RelNotes/2.10.0.txt
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -235,13 +235,12 @@ Performance, Internal Implementation, Development Support etc.
* The API to iterate over all the refs (i.e. for_each_ref(), etc.)
has been revamped.
- * The handling of the "text = auto" attribute has been updated.
+ * The handling of the "text=auto" attribute has been corrected.
$ echo "* text=auto eol=crlf" >.gitattributes
used to have the same effect as
- $ echo "* text=auto eol=crlf" >.gitattributes
- $ git config core.eol crlf
- i.e. declaring all files are text; the combination now is
- equivalent to doing
+ $ echo "* text eol=crlf" >.gitattributes
+ i.e. declaring all files are text (ignoring "auto"). The
+ combination has been fixed to be equivalent to doing
$ git config core.autocrlf true
* A few tests that specifically target "git rebase -i" have been