diff --git a/.editorconfig b/.editorconfig
index 717a4d903bb..66cd7b8f474 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,12 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
+# Ignore diffs/patches
+[*.{diff,patch}]
+end_of_line = ignore
+insert_final_newline = ignore
+trim_trailing_whitespace = ignore
+
 # see https://nixos.org/nixpkgs/manual/#chap-conventions
 
 # Match nix/perl/python/ruby/shell/docbook files, set indent to spaces
@@ -28,7 +34,3 @@ indent_size = 2
 # Match perl/python/shell scripts, set indent width of four
 [*.{pl,py,sh}]
 indent_size = 4
-
-# Match diffs, avoid to trim trailing whitespace
-[*.{diff,patch}]
-trim_trailing_whitespace = false