From: Bruno Haible Date: Fri, 17 Feb 2023 22:20:55 +0000 (+0100) Subject: Improve 'git diff' of *.texi and *.m4 files. X-Git-Tag: v0.22~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228cc630fb80dab5e8b574af0c313585806e9ac0;p=thirdparty%2Fgettext.git Improve 'git diff' of *.texi and *.m4 files. --- diff --git a/.gitattributes b/.gitattributes index ca4ea2772..82d6f8e9b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,10 @@ +# See gnulib/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 + +# Run this to make 'git diff' on .m4 files give nicer hunk context: +# git config diff.m4.xfuncname '^((AC_DEFUN|m4_define)[^,)]*)' +*.m4 diff=m4