From bd476ca20148f6388df6bf8d1023addaf41b6e4c Mon Sep 17 00:00:00 2001 From: Rob Bast Date: Thu, 28 May 2015 14:36:38 +0200 Subject: [PATCH] added/disabled whitespace error flags --- .gitattributes | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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