aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 179e5751d..f4e6a6851 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