diff options
author | Fred Sundvik <fsundvik@gmail.com> | 2018-02-03 17:47:28 +0200 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-02-03 15:20:44 -0500 |
commit | e7bb9754823ae7a09f7ba3bf4ecd7b45663ae382 (patch) | |
tree | 17182fcb23a03dc120ac4c73a90eea68c14e97f6 /.editorconfig | |
parent | a6be48681a92cd47c63cbe763b723c13cc443399 (diff) | |
download | qmk_firmware-e7bb9754823ae7a09f7ba3bf4ecd7b45663ae382.tar.gz qmk_firmware-e7bb9754823ae7a09f7ba3bf4ecd7b45663ae382.zip |
Fix .editorconfig to not mess with line endings
Diffstat (limited to '.editorconfig')
-rw-r--r-- | .editorconfig | 20 |
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 | |||
8 | indent_size = 2 | 8 | indent_size = 2 |
9 | 9 | ||
10 | # We recommend you to keep these unchanged | 10 | # We recommend you to keep these unchanged |
11 | end_of_line = lf | ||
12 | charset = utf-8 | 11 | charset = utf-8 |
13 | trim_trailing_whitespace = true | 12 | trim_trailing_whitespace = true |
14 | insert_final_newline = true | 13 | insert_final_newline = true |
@@ -16,3 +15,22 @@ insert_final_newline = true | |||
16 | [*.md] | 15 | [*.md] |
17 | trim_trailing_whitespace = false | 16 | trim_trailing_whitespace = false |
18 | indent_size = 4 | 17 | indent_size = 4 |
18 | |||
19 | # Make these match what we have in .gitattributes | ||
20 | [*.mk] | ||
21 | end_of_line = lf | ||
22 | |||
23 | [Makefile] | ||
24 | end_of_line = lf | ||
25 | |||
26 | [*.sh] | ||
27 | end_of_line = lf | ||
28 | |||
29 | # The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files | ||
30 | |||
31 | |||
32 | # We don't have gitattributes properly for these | ||
33 | # So if the user have for example core.autocrlf set to true | ||
34 | # the line endings would be wrong. | ||
35 | [lib/**] | ||
36 | end_of_line = unset | ||