tweaked gitattributes a bit [skip ci]

KSST · Dec 18, 2015 · f751f10 · f751f10
1 parent 7545328
commit f751f10
Showing 1 changed file with 26 additions and 20 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,20 +1,26 @@
-#
-# .gitattributes
-#
-
-# cut the fat - this stuff is removed when doing git export
-.coveralls.yml export-ignore
-.editorconfig export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.php_cs export-ignore
-.scrutinizer.yml export-ignore
-.travis.yml export-ignore
-phpmd.xml export-ignore
-phpunit.xml.dist export-ignore
-/tests export-ignore
-
-*.php diff=php
-
-# seclare files that will always have CRLF line endings on checkout.
-.sh text eol=lf
+#
+# .gitattributes
+#
+
+# cut the fat - this stuff is removed when doing git export
+.coveralls.yml export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.php_cs export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml export-ignore
+phpmd.xml export-ignore
+phpunit.xml.dist export-ignore
+/tests export-ignore
+
+# Auto-detect text files, ensure they use LF.
+* text=auto eol=lf
+
+# seclare files that will always have CRLF line endings on checkout.
+.sh text eol=lf
+
+# These files are always considered text and should use LF.
+# See core.whitespace @ http://git-scm.com/docs/git-config for whitespace flags.
+*.php   text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
+*.json  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4