From: "Rüdiger Sonderfeld" <ruediger@c-plusplus.de>
To: emacs-devel@gnu.org
Cc: David Kastrup <dak@gnu.org>, Artur Malabarba <bruce.connor.am@gmail.com>
Subject: Re: The ChangeLog and merge conflicts
Date: Tue, 10 Feb 2015 01:17:38 +0100 [thread overview]
Message-ID: <1870971.ZeOuNpposk@descartes> (raw)
In-Reply-To: <871tlytyut.fsf@fencepost.gnu.org>
On Tuesday 10 February 2015 01:05:30 David Kastrup wrote:
> It's still sort of a nuisance to maintain the corresponding entry in the
> top level .gitattributes file (since it is itself under version
> control), but at least this works reasonably well for the non-toplevel
> ChangeLog file merges.
For local attributes you can create a .git/info/attributes file. That will be
local to the repo. If you are working with several projects using ChangeLog
files then it probably even makes sense to place it in the global attributes
file ($XDG_CONFIG_HOME/git/attributes or ~/.config/git/attributes).
Regards,
Rüdiger
next prev parent reply other threads:[~2015-02-10 0:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAAdUY-+7hjTB6k=nzC37_Dnm2VWe3tvworne6fmABRkpwjLdXw@mail.gmail.com>
[not found] ` <CAAdUY-Kx+AjHDEoYVzfERFWFRMArrCMvqY3TTB1vndsQAUxwnA@mail.gmail.com>
[not found] ` <CAAdUY-LyCBThR5PJFPuPf-mNbgFvn5NWGnKgeeh7QVXViaFqTg@mail.gmail.com>
2015-02-09 23:36 ` The ChangeLog and merge conflicts Artur Malabarba
2015-02-10 0:05 ` David Kastrup
2015-02-10 0:17 ` Rüdiger Sonderfeld [this message]
2015-02-10 3:43 ` Eli Zaretskii
2015-02-10 6:55 ` Artur Malabarba
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1870971.ZeOuNpposk@descartes \
--to=ruediger@c-plusplus.de \
--cc=bruce.connor.am@gmail.com \
--cc=dak@gnu.org \
--cc=emacs-devel@gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).