[SCM] GNU Autoconf source repository branch, master, updated. v2.62-74-g9479d2c

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=9479d2c6399aac474d83a3e46ba1fb5064d5147e

The branch, master has been updated
       via  9479d2c6399aac474d83a3e46ba1fb5064d5147e (commit)
      from  aeff96ce94c6ef4ea28fb77cf3c121e0db35cf09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9479d2c6399aac474d83a3e46ba1fb5064d5147e
Author: Eric Blake <address@hidden>
Date:   Mon Aug 18 06:25:49 2008 -0600

    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>

-----------------------------------------------------------------------

Summary of changes:
 .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.
 


hooks/post-receive
--
GNU Autoconf source repository