diff --git a/.gitattributes b/.gitattributes
index 8b137891..7e39eb61 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-
+*.at   diff=autotest
+*.texi diff=texinfo
diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 00000000..4513ad63
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,12 @@
+# To use this gitconfig file, run
+#
+# git config --local include.path ../.gitconfig
+#
+# It adds an `[include]` section in .git/config.
+# See <https://git-scm.com/docs/git-config#_includes>.
+
+[diff "autotest"]
+        xfuncname = "^((m4_define|m4_pushdef|AT_SETUP).*)$"
+
+[diff "texinfo"]
+        xfuncname = "^@node .*$"