From: "Rüdiger Sonderfeld" <ruediger@c-plusplus.de>
To: emacs-devel@gnu.org
Cc: Ted Zlatanov <tzz@lifelogs.com>
Subject: Re: This Is The Git Help Mailing List
Date: Fri, 05 Dec 2014 17:03:59 +0100 [thread overview]
Message-ID: <2849552.Jb2DAzm063@descartes> (raw)
In-Reply-To: <87tx1aoh6p.fsf@lifelogs.com>
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
next prev parent reply other threads:[~2014-12-05 16:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 16:06 This Is The Git Help Mailing List Lars Magne Ingebrigtsen
2014-11-13 16:19 ` Lars Magne Ingebrigtsen
2014-11-13 17:04 ` Eli Zaretskii
2014-11-13 17:19 ` Andreas Schwab
2014-11-13 17:38 ` Eli Zaretskii
2014-12-05 0:45 ` Juri Linkov
2014-12-05 2:04 ` Stefan Monnier
2014-12-05 4:26 ` Ted Zlatanov
2014-12-05 16:03 ` Rüdiger Sonderfeld [this message]
2014-12-05 15:59 ` Rüdiger Sonderfeld
2014-11-13 16:20 ` Karl Fogel
2014-11-13 17:24 ` Paul Eggert
2014-11-13 17:30 ` Lars Magne Ingebrigtsen
2014-11-13 16:21 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2849552.Jb2DAzm063@descartes \
--to=ruediger@c-plusplus.de \
--cc=emacs-devel@gnu.org \
--cc=tzz@lifelogs.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.