From f44e4bb1e9a90b872cd3bdd4069c0b8f9e6b8cf0 Mon Sep 17 00:00:00 2001 From: OlegYch Date: Tue, 26 Jun 2018 17:38:05 +0300 Subject: [PATCH] remove gittatributes, assume core.autocrlf=false scalafmt is configured to use lf, as your editor should be, so there is no point having git tinker with line endings otherwise on checkout on windows source files get converted to crlf (by git) and on compile they get converted back to lf (by scalafmt) --- .gitattributes | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index f3dbe80d8..c637cb2f6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,3 @@ -# Set default behaviour, in case users don't have core.autocrlf set. -* text=auto - -# Explicitly declare text files we want to always be normalized and converted -# to native line endings on checkout. -*.scala text -*.java text - # Exclude contraband generated files from diff (by default - you can see it if you want) **/contraband-scala/**/* -diff merge=ours **/contraband-scala/**/* linguist-generated=true