Re: This Is The Git Help Mailing List

[Ted Zlatanov]

On Thu, 04 Dec 2014 21:04:47 -0500 Stefan Monnier <address@hidden> wrote: 

>> I wonder why we still don't have in emacs/.gitattributes this line?
SM> Probably because noone did it.

SM>         Stefan "who knows nothing about .gitattributes"

For general use (not just inside Emacs) put this in ~/.gitconfig :

[core]
        attributesfile = ~/.gitattributes

[diff "lisp"]
        xfuncname = "^(\\(.*)$"

[merge "merge-changelog"]
        name = GNU-style ChangeLog merge driver
        driver = /usr/local/bin/git-merge-changelog %O %A %B

and then in ~/.gitattributes :

ChangeLog       merge=merge-changelog
*.el diff=lisp

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

Ted