NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index ca4ea27..35a14df 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,6 @@
+# See 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