(chore): Fix git conflicts with line endings (ScoopInstaller#3693)

* Update .editorconfig * Update .gitattributes
jreleaser · Jun 21, 2022 · df10303 · df10303
1 parent c34e34c
commit df10303
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,10 +12,6 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{[Bb][Aa][Tt],[Cc][Mm][Dd]}]
-# DOS/Win *requires* BAT/CMD files to have CRLF newlines
-end_of_line = crlf
-
 [[Mm]akefile{,.*}]
 # TAB-style indentation
 indent_style = tab
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,4 @@
-# retain windows line-endings in case checked out on mac or linux
-* text eol=crlf
+# Since Scoop is a Windows-only tool, we can safely use CRLF line endings for all text files.
+# If Git decides that the content is text, its line endings will be normalized to CRLF in the working tree on checkout.
+# In the Git index/repository the files will always be stored with LF line endings. This is fine.
+* text=auto eol=crlf