diff --git a/.editorconfig b/.editorconfig
index c97a91b6fa5..d769b46a4b6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,3 +11,9 @@ trim_trailing_whitespace = true
 [*.{php,html,twig}]
 indent_style = space
 indent_size = 4
+
+[*.md]
+max_line_length = 80
+
+[COMMIT_EDITMSG]
+max_line_length = 0
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..6313b56c578
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf