summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.editorconfig8
-rw-r--r--ChangeLog5
2 files changed, 12 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig
index 808512ec0..1dc393c0e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,10 +6,16 @@ root = true
end_of_line = lf
tab_width = 8
indent_size = 2
-indent_style = tab
+indent_style = space
+
+[Functions/VCS_Info/**/*]
+indent_size = 4
+indent_style = space
[ChangeLog]
indent_size = 8
+indent_style = tab
[*.[ch]]
indent_size = 4
+indent_style = tab
diff --git a/ChangeLog b/ChangeLog
index 4b86371ba..4d9e7adea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-12 Daniel Shahaf <danielsh@apache.org>
+
+ * unposted: .editorconfig: Specify spaces rather than tabs for
+ zsh scripts.
+
2020-03-11 dana <dana@dana.is>
* 45470: Test/C02cond.ztst: Simplify '-N cond' test