annotate .gitattributes @ 17359:012da8067470

autoupdate
author Karl Berry <karl@freefriends.org>
date Fri, 08 Mar 2013 15:24:22 -0800
parents 2e5821b6f988
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11830
2e5821b6f988 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 9694
diff changeset
1 # See lib/git-merge-changelog.c for making this useful.
9694
6a8d9b9a5d7c Specify custom merge drivers.
Bruno Haible <bruno@clisp.org>
parents:
diff changeset
2 ChangeLog merge=merge-changelog
11830
2e5821b6f988 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 9694
diff changeset
3
2e5821b6f988 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 9694
diff changeset
4 # Run this to make 'git diff' on texinfo files give nicer hunk context:
2e5821b6f988 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 9694
diff changeset
5 # git config diff.texinfo.funcname '^@node[ ][ ]*\\([^,][^,]*\\)'
2e5821b6f988 doc: improve git diff of texinfo files
Eric Blake <ebb9@byu.net>
parents: 9694
diff changeset
6 *.texi* diff=texinfo