diff --git a/.gitattributes b/.gitattributes
index 22da6dfed..3ef36cef4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,8 @@
-* text=auto
-*.php text diff=php
-*.json text eol=lf
-*.test text eol=lf
+# Auto-detect text files, ensure they use LF.
+*       text=auto 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,tabwidth=4 diff=php
+*.json  text eol=lf whitespace=blank-at-eol,-blank-at-eof,space-before-tab,tabwidth=4
+*.test  text eol=lf whitespace=blank-at-eol,-blank-at-eof,space-before-tab,tabwidth=4