From 1faf2169b4ff31a3c6fa6083f319048f9f8c93dc Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Wed, 4 Dec 2019 16:03:27 +0100 Subject: [PATCH] Update .gitattributes to be consistent with .editorconfig --- .gitattributes | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.gitattributes b/.gitattributes index c6bec3315..3e71b9a8b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,14 +1,24 @@ # Auto detect text files and perform LF normalization * text=auto -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +# Enforce checkout with linux lf consistent over all platforms +*.cfg text eol=lf +*.css text eol=lf +*.htaccess text eol=lf +*.js text eol=lf +*.json text eol=lf +*.md text eol=lf +*.php text eol=lf +*.rst text eol=lf +*.sql text eol=lf +*.svg text eol=lf +*.tmpl text eol=lf +*.ts text eol=lf +*.tsconfig text eol=lf +*.txt text eol=lf +*.typoscript text eol=lf +*.xlf text eol=lf +*.xml text eol=lf +*.xsl text eol=lf +*.yaml text eol=lf +*.yml text eol=lf