git diff on docs

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I'm applying this, which makes 'git diff' give better context for texinfo
files.  Thanks, Jim, for the idea.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkipavcACgkQ84KuGfSFAYAPCACcCPC9MMo6NASnd9Jn/t0vE6yW
bYUAoKHfhuOHwg45V9Q06dx1+HkQlQtL
=T+JN
-----END PGP SIGNATURE-----

>From 9479d2c6399aac474d83a3e46ba1fb5064d5147e Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 18 Aug 2008 06:25:49 -0600
Subject: [PATCH] Let 'git diff' give better context for doc updates.

* .gitattributes (*.texi*): Add new entry.
* README-hacking: Mention how to use it.
Inspired by a coreutils patch by Jim Meyering.

Signed-off-by: Eric Blake <address@hidden>
---
 .gitattributes |    2 ++
 ChangeLog      |    7 +++++++
 README-hacking |    7 +++++++
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 130bd39..621e75b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
+# See README-hacking for ideas on making these settings useful.
+*.texi*                diff=texinfo
 ChangeLog      merge=merge-changelog
 config.guess   -whitespace
 config.sub     -whitespace
diff --git a/ChangeLog b/ChangeLog
index d62576b..442baad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-18  Eric Blake  <address@hidden>
+
+       Let 'git diff' give better context for doc updates.
+       * .gitattributes (*.texi*): Add new entry.
+       * README-hacking: Mention how to use it.
+       Inspired by a coreutils patch by Jim Meyering.
+
 2008-08-15  Eric Blake  <address@hidden>
 
        Fix m4_map regression from 2007-10-16.
diff --git a/README-hacking b/README-hacking
index f9b8873..5d84404 100644
--- a/README-hacking
+++ b/README-hacking
@@ -37,6 +37,13 @@ generate the version string.  Therefore, we recommend:
 You may find it useful to install the git-merge-changelog merge driver:
 http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
 
+then add the following to .git/config or ~/.gitconfig:
+[merge "merge-changelog"]
+       name = GNU ChangeLog merge driver
+       driver = git-merge-changelog %O %A %B
+[diff "texinfo"]
+       funcname = address@hidden ][\t ]*\\([^,][^,]*\\)
+
 Only building the initial full source tree will be a bit painful.
 Later, a plain `git pull && make' should be sufficient.
 
-- 
1.5.6.4