Improve 'git diff' of *.texi and *.m4 files.

diff --git a/.gitattributes b/.gitattributes
index ca4ea2772a39ad70788d4c455b87d9dbd23996d1..82d6f8e9b177228e87d4fe655c86c9b2c27d83e8 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,10 @@
+# See gnulib/lib/git-merge-changelog.c for making this useful.
 ChangeLog      merge=merge-changelog
+
+# Run this to make 'git diff' on texinfo files give nicer hunk context:
+#   git config diff.texinfo.funcname '^@node[   ][      ]*\\([^,][^,]*\\)'
+*.texi* diff=texinfo
+
+# Run this to make 'git diff' on .m4 files give nicer hunk context:
+#   git config diff.m4.xfuncname '^((AC_DEFUN|m4_define)[^,)]*)'
+*.m4   diff=m4