diff --git a/.editorconfig b/.editorconfig
index a35d225886..c9b76fd638 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,10 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace =  true
+
 [*.sh]
 # like -i=2
 indent_style = space
diff --git a/.gitattributes b/.gitattributes
index 86f6b3b50b..1283f63835 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,18 +3,41 @@
 
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
-*.c text
-*.cpp text
-*.h text
-*.s text
-*.S text
-*.ld text
-*.txt text
-*.xml text
-*.py text
-*.md text
-*.json text
+.astyleignore text eol=lf
+.astylerc text eol=lf
+.editorconfig text eol=lf
+.flake8 text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+
+*.adoc text eol=lf
+*.c text eol=lf
+*.cmake text eol=lf
+*.cpp text eol=lf
+*.css text eol=lf
+*.dtsi text eol=lf
+*.gv text eol=lf
+*.h text eol=lf
+*.html text eol=lf
+*.in text eol=lf
+*.ino text eol=lf
+*.json text eol=lf
+*.ld text eol=lf
+*.md text eol=lf
+*.MD text eol=lf
+*.old text eol=lf
+*.pde text eol=lf
+*.properties text eol=lf
+*.py text eol=lf
+*.s text eol=lf
+*.S text eol=lf
+*.sh text eol=lf
+*.spec text eol=lf
+*.txt text eol=lf
+*.yml text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
-*.png binary
 *.jpg binary
+*.pdf binary
+*.png binary
+
diff --git a/CI/astyle/.astylerc b/CI/astyle/.astylerc
index f92622a908..a64f33c366 100644
--- a/CI/astyle/.astylerc
+++ b/CI/astyle/.astylerc
@@ -13,6 +13,7 @@ style=kr
 # 2 spaces, convert tabs to spaces
 indent=spaces=2
 convert-tabs
+lineend=linux
 
 # Indent switches and cases
 indent-classes