Re: This Is The Git Help Mailing List

[Rüdiger Sonderfeld]

On Thursday 04 December 2014 23:26:38 Ted Zlatanov wrote:
> and then in ~/.gitattributes :
> 
> ChangeLog       merge=merge-changelog
> *.el diff=lisp

You can also add custom hunk headers for C code (builtin: diff=cpp) and 
texinfo (requires another xfuncname).  See:

http://www.emacswiki.org/emacs/GitForEmacsDevs#UsefulAddOns

(A collection of other xfuncname and gitattributes, I started: 
https://gist.github.com/ruediger/5647207 )

> That has been helpful for me.  The core.attributesfile setting is fairly
> new, though, so get the latest git.

The default value is $XDG_CONFIG_HOME/git/attributes (with XDG_CONFIG_HOME 
defaulting to ~/.config if unset).  That way there are less files polluting ~

Regards,
Rüdiger