relnotes: redo the description of text=auto fix

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
index 179e5751d8cd8cdc3abddaf9683956c4ad572ce9..f4e6a68510b414271590c3e10dfe04fcf69ddbc5 100644 (file)
--- 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 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
    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
    $ git config core.autocrlf true
 
  * A few tests that specifically target "git rebase -i" have been