From 6010db3d7a1b71c385a8ffcdfe6298da33705a4a Mon Sep 17 00:00:00 2001 From: Marius Thesing Date: Sun, 7 Apr 2024 12:42:32 +0200 Subject: [PATCH 1/2] git: checkout cs files with crlf --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index fa94b297a..e5e53c774 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ * text=auto -*.cs text +*.cs text eol=crlf *.xaml text *.sln eol=crlf *.csproj eol=crlf From 7a9cb5e7ac0ee2777dbba0604776c31a192a18b2 Mon Sep 17 00:00:00 2001 From: Marius Thesing Date: Mon, 8 Apr 2024 22:09:51 +0200 Subject: [PATCH 2/2] remove end_of_line from .editorconfig instead of forcing crlf checkout in git --- .editorconfig | 1 - .gitattributes | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 91bdfb44f..d3d940a89 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,6 @@ insert_final_newline = true indent_style = space indent_size = 4 tab_width = 4 -end_of_line = crlf [*.{xml,csproj,props}] diff --git a/.gitattributes b/.gitattributes index e5e53c774..fa94b297a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ * text=auto -*.cs text eol=crlf +*.cs text *.xaml text *.sln eol=crlf *.csproj eol=crlf