doc: improve git diff of texinfo files

* .gitattributes: Add rule for *.texi files, with hint on how to
use it.
Copied from m4, and based on a report by Bruno Haible.

Signed-off-by: Eric Blake <ebb9@byu.net>

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

diff --git a/ChangeLog b/ChangeLog
index b08b0c7..a18e8ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-14  Eric Blake  <ebb9@byu.net>
+
+       doc: improve git diff of texinfo files
+       * .gitattributes: Add rule for *.texi files, with hint on how to
+       use it.
+       Copied from m4, and based on a report by Bruno Haible.
+
 2009-08-14  Bruno Haible  <bruno@clisp.org>
 
        Disable multithread support by default on Cygwin 1.5.x for real.