From 07d1a42badf5a29b030f9d1c4c8dd1ff9fdc8a91 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Aug 2016 10:18:59 -0700 Subject: relnotes: redo the description of text=auto fix Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 179e575..f4e6a68 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 -- cgit v0.10.2-6-g49f6