summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2018-02-03 16:47:28 +0100
committerJack Humbert <jack.humb@gmail.com>2018-02-03 21:20:44 +0100
commite7bb9754823ae7a09f7ba3bf4ecd7b45663ae382 (patch)
tree17182fcb23a03dc120ac4c73a90eea68c14e97f6
parenta6be48681a92cd47c63cbe763b723c13cc443399 (diff)
downloadqmk_firmware-e7bb9754823ae7a09f7ba3bf4ecd7b45663ae382.tar.gz
qmk_firmware-e7bb9754823ae7a09f7ba3bf4ecd7b45663ae382.tar.xz
Fix .editorconfig to not mess with line endings
-rw-r--r--.editorconfig20
1 files changed, 19 insertions, 1 deletions
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