From 9c14d83b2ad564c45e74500399b36ea31179bb01 Mon Sep 17 00:00:00 2001
From: "Robert (Jamie) Munro" <jamie@diffblue.com>
Date: Tue, 29 Nov 2016 12:22:18 +0000
Subject: [PATCH 1/2] Add initial .editorconfig file

---
 .editorconfig | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..4970cf27f38
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+
+indent_style = space
+indent_size = 2
+
+trim_trailing_whitespace = true
+
+max_line_length = 80
+end_of_line = lf
+insert_final_newline = true

From 0d716f7222c1a5257477e9bc2eb33e016d8b9cb2 Mon Sep 17 00:00:00 2001
From: "Robert (Jamie) Munro" <jamie@diffblue.com>
Date: Tue, 29 Nov 2016 17:26:59 +0000
Subject: [PATCH 2/2] Don't remove trailing spaces from patch files

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 4970cf27f38..0b45e8b3592 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,3 +11,7 @@ trim_trailing_whitespace = true
 max_line_length = 80
 end_of_line = lf
 insert_final_newline = true
+
+[*patch]
+# Trailing spaces are significant in patch files
+trim_trailing_whitespace = false