diff --git a/.editorconfig b/.editorconfig
index 63108ec4c9c4c..16f1952632a8b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,7 +2,13 @@
 root = true
 
 [*]
+# yes, we use tabs
 indent_style = tab
+
+# To control tab size in github diffs
+# See https://github.com/isaacs/github/issues/170#issuecomment-150489692
+indent_size = 2
+
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true