summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-15 10:20:38 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-15 13:15:49 -0700
commit07c92928f2b782330df6e78dd9d019e984d820a7 (patch)
treef02b5543f5592998ec7adb7c9591c4d8705964b9
parent726cc2ba12c4573ab2e623077479c51019e1f3cd (diff)
downloadgit-07c92928f2b782330df6e78dd9d019e984d820a7.tar.gz
Relnotes: decribe the updates to the "text=auto" attribute
Helped-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.10.0.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
index 88d336ff16..179e5751d8 100644
--- a/Documentation/RelNotes/2.10.0.txt
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -235,6 +235,15 @@ 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.
+ $ 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
+ $ git config core.autocrlf true
+
* A few tests that specifically target "git rebase -i" have been
added.