summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-09-21 11:56:01 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2015-09-21 11:56:50 -0700
commite3a6246eff4a793171511f32e9c6877faa2f6f3e (patch)
tree4d2aef8749b5bf628e498147eb8fae8523eb1f1b /.gitattributes
parentdb828f62f6f17414fbbc3206dac123dc73dd6055 (diff)
downloademacs-e3a6246eff4a793171511f32e9c6877faa2f6f3e.tar.gz
Improve git diff hunk headers for .el, .texi
Problem reported by Alan Mackenzie in: http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html * .gitattributes (*.el, *.texi): New patterns. * autogen.sh: Configure diff.elisp.xfuncname and diff.texinfo.xfuncname if using Git.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 21af4e68770..ac26a2bbcd2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -44,3 +44,7 @@ doc/misc/texinfo.tex -whitespace=blank-at-eol
*.sig binary
*.tiff binary
etc/e/eterm-color binary
+
+# Hooks for non-default diff hunk headers; see autogen.sh.
+*.el diff=elisp
+*.texi diff=texinfo