[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: This Is The Git Help Mailing List

From: Rüdiger Sonderfeld
Subject: Re: This Is The Git Help Mailing List
Date: Fri, 05 Dec 2014 17:03:59 +0100
User-agent: KMail/4.13.3 (Linux/3.13.0-40-generic; KDE/4.13.3; x86_64; ; )

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:


(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 ~


reply via email to

[Prev in Thread] Current Thread [Next in Thread]