Merge pull request #1015 from Vankog/auto-line_endings

fix line-endings conflict between prettier and git
jqno · Nov 6, 2024 · a5c9288 · a5c9288
2 parents 3e6ac1b + ccab821
commit a5c9288
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+* text=auto eol=lf
+
+# make sure that script files are always in the correct format, no matter the OS.
+# i.e. Windows needs batch files to have CRLF, but shell scripts always need to be LF, which is especially important for WSL contexts.
+*.sh           text eol=lf
+*.bat          text eol=crlf
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -1,3 +1,4 @@
 tabWidth: 4
 printWidth: 100
 trailingComma: "none"
+endOfLine: "lf"