From d001fc5a98e98911ff976bdb31581824bc0e920d Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 13 Aug 2009 07:15:28 -0600 Subject: 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 --- .gitattributes | 5 +++++ ChangeLog | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.gitattributes b/.gitattributes index ca4ea2772a..35a14df8a2 100644 --- 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 b08b0c763c..a18e8ea2e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-08-14 Eric Blake + + 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 Disable multithread support by default on Cygwin 1.5.x for real. -- cgit v1.2.1