blob: c7fecf66a5744dc9cac1307b7ce4ccec83e2346e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
|
# 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
# 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
# Improve diff hunk context on Python files.
*.py diff=python
|