diff --git a/.gitattributes b/.gitattributes
index 8f4b8bacee0..b7d52e56063 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -53,3 +53,5 @@ tests/lib_2/mirrors/method_mirror_source_other.dart -text
 *.png binary
 *.jpg binary
 *.xpi binary
+
+*.status diff=status
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 00000000000..7df539ba36b
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,2 @@
+[diff "status"]
+	xfuncname = "^\\[.*\\]$"