Merge pull request #1843 from xtuple/4_6_x

[xtuple] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 18fab68..bcd2e4c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,20 +1,14 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-* text=auto
+# Set default behavior, change CRLF to LF
+* text eol=lf
 
-# Explicitly declare text files we want to always be normalized and converted
-# to native line endings on checkout.
-*.c text
-*.h text
-
-# Declare files that will always have CRLF line endings on checkout.
-*.sln text eol=crlf
-# Declare files that will always have LF line endings on checkout.
-*.sh text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
+# Do not treat these as text
 *.jpg binary
-
-# These are not really binary, but we want them to be left alone
-*.json binary
-*.sql binary
+*.data binary
+*.png binary
+*.ttf binary
+*.otf binary
+*.eot binary
+*.gif binary
+*.gz binary
+*.ico binary
+*.phar binary
\ No newline at end of file