summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index ca4ea2772a..35a14df8a2 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