Merge remote-tracking branch 'upstream/pull/5085'

[rails.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 5be0fcdf696fed98292cdbadf0710d32480143e7..6313b56c57848efce05faa7aa7e901ccfc2886ea 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,17 +1 @@
-# text=auto is only correctly supported in git 2.10.0
-#  https://github.com/git/git/blob/master/Documentation/RelNotes/2.10.0.txt#L248
-# * text=auto eol=lf
-*.sh text eol=lf
-*.sql text eol=lf
-*.rb text eol=lf
-*.erb text eol=lf
-*.json text eol=lf
-*.yml text eol=lf
-*.builder text eol=lf
-*.js text eol=lf
-*.jbuilder text eol=lf
-*.svg text eol=lf
-*.css text eol=lf
-*.scss text eol=lf
-*.png binary
-*.gif binary
+* text=auto eol=lf