X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.editorconfig;h=4cd051ce9522006c56d0a294c132f187b585f418;hb=76e0d23887b8ddc70e9afb30bb7b91e9fec96c35;hp=82837f7f132aa09a12ed3f9fdf4b01ec88d13742;hpb=bc98b0d9eb5eb1a4df140ab6e2158904e5e100e5;p=qmk_firmware.git

diff --git a/.editorconfig b/.editorconfig
index 82837f7f1..4cd051ce9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,7 +8,6 @@ indent_style = space
 indent_size = 2
 
 # We recommend you to keep these unchanged
-end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
@@ -16,3 +15,22 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 indent_size = 4
+
+# Make these match what we have in .gitattributes
+[*.mk]
+end_of_line = lf
+
+[Makefile]
+end_of_line = lf
+
+[*.sh]
+end_of_line = lf
+
+# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
+
+
+# We don't have gitattributes properly for these
+# So if the user have for example core.autocrlf set to true
+# the line endings would be wrong.
+[lib/**]
+end_of_line = unset