[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: This Is The Git Help Mailing List
From: |
Ted Zlatanov |
Subject: |
Re: This Is The Git Help Mailing List |
Date: |
Thu, 04 Dec 2014 23:26:38 -0500 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) |
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