From 4b0854fcc16ef1cce575a91aa8896d23baf864c7 Mon Sep 17 00:00:00 2001 From: Jak Daniels Date: Sat, 17 Oct 2015 19:20:31 +0100 Subject: [PATCH] Set the repo up to have normalised line endings --- .gitattributes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8d09dc3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,21 @@ +# Auto detect text files and perform LF normalization +* text=auto + +*.cs text diff=csharp +*.java text diff=java +*.html text diff=html +*.css text +*.js text +*.sql text + +*.csproj text merge=union +*.sln text merge=union eol=crlf + +*.docx diff=astextplain +*.DOCX diff=astextplain + +# absolute paths are ok, as are globs +/**/postinst* text eol=lf + +# paths that don't start with / are treated relative to the .gitattributes folder +relative/path/*.txt text eol=lf