|
@@ -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
|