1 # See lib/git-merge-changelog.c for making this useful.
2 ChangeLog merge=merge-changelog
4 # Run this to make 'git diff' on texinfo files give nicer hunk context:
5 # git config diff.texinfo.funcname '^@node[ ][ ]*\\([^,][^,]*\\)'
8 # Run this to make 'git diff' on .m4 files give nicer hunk context:
9 # git config diff.m4.xfuncname '^((AC_DEFUN|m4_define)[^,)]*)'
12 # Improve diff hunk context on Python files.