From f99503b60c5b62c0504e83c5e74e503938b9f56f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 11 Apr 2018 16:09:09 +0900 Subject: [PATCH] Add new gitattributes --- .gitattributes | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitattributes b/.gitattributes index f9cb7c5c9a..baf69b41d1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,19 +1,23 @@ -# This won't normalise line endings, but it will ensure that merge drivers use CRLF -* -text eol=crlf - -# Currently in-use binary file extensions -*.blend binary -*.bmp binary -*.dll binary -*.exe binary -*.icns binary -*.ico binary -*.jpg binary -*.osz2 binary -*.pdn binary -*.psd binary -*.PSD binary -*.tga binary -*.ttf binary -*.wav binary -*.xnb binary +# Autodetect text files and ensure that we normalise their +# line endings to lf internally. When checked out they may +# use different line endings. +* text=auto + +# Check out with crlf (Windows) line endings +*.sln text eol=crlf +*.csproj text eol=crlf +*.cs text diff=csharp eol=crlf +*.resx text eol=crlf +*.vsixmanifest text eol=crlf +packages.config text eol=crlf +App.config text eol=crlf +*.bat text eol=crlf +*.cmd text eol=crlf +*.snippet text eol=crlf + +# Check out with lf (UNIX) line endings +*.sh text eol=lf +.gitignore text eol=lf +.gitattributes text eol=lf +*.md text eol=lf +.travis.yml text eol=lf \ No newline at end of file