X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=.gitattributes;h=35a14df8a2b950c9a78f0b95d0f71108e3a9eee7;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=ca4ea2772a39ad70788d4c455b87d9dbd23996d1;hpb=63fdbedfb1e058306fbe60053eef0a050ab99016;p=gnulib.git diff --git a/.gitattributes b/.gitattributes index ca4ea2772..35a14df8a 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