diff options
| -rw-r--r-- | .gitattributes | 5 | ||||
| -rw-r--r-- | ChangeLog | 7 |
2 files changed, 12 insertions, 0 deletions
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 @@ -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. |