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 <ebb9@byu.net>

diff --git a/.gitattributes b/.gitattributes
index 130bd3978b2cb0deb10f75e3b1ada7c00095c858..621e75b4bde1fe54bdd7840966ab718f664fe962 100644 (file)
--- 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 d62576b789e1714fa3e9a51ea2cfbace5c89e660..442baadcd317de3e91a3f2b721c90787ced543bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-18  Eric Blake  <ebb9@byu.net>
+
+       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  <ebb9@byu.net>
 
        Fix m4_map regression from 2007-10-16.

diff --git a/README-hacking b/README-hacking
index f9b8873dce7f559a6bed24b45bebabba73c3d414..5d84404696fd4867fc57f61f2bbc252fe63c77f1 100644 (file)
--- 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 = ^@node[\t ][\t ]*\\([^,][^,]*\\)
+
 Only building the initial full source tree will be a bit painful.
 Later, a plain `git pull && make' should be sufficient.