From: Samuel Bronson <naesten@gmail.com>
To: binutils@sourceware.org
Cc: gcc-patches@gcc.gnu.org,gdb-patches@sourceware.org
Subject: Re: [RFC] Add a .gitattributes file for use with git-merge-changelog
Date: Fri, 20 Jun 2014 23:02:00 -0000 [thread overview]
Message-ID: <87k38bgp7w.fsf@naesten.mooo.com> (raw)
In-Reply-To: <87ha3fad30.fsf@fleche.redhat.com>
Tom Tromey <tromey@redhat.com> writes:
>>>>>> "Samuel" == Samuel Bronson <naesten@gmail.com> writes:
>
> Samuel> [Am I really supposed to CC this to gcc@ like binutils/MAINTAINERS
> Samuel> says I should?]
>
> I think just for files that are intended to be put in both trees and
> shared.
Well, they're certainly welcome to add such a file to their repository.
> Samuel> Individual users will still have to:
> Samuel> 1. Install git-merge-changelog
> Samuel> 2. Set up the merge driver in their git config
>
> What happens if they do not?
Not much; git just falls back to the default ("text") merge driver in
that case. (This appears to have been so obvious that nobody actually
bothered to document it?)
I find myself wondering: how much commentary should go into the
.gitattributes file, and do such files get ChangeLog entries?
--
Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread!
next prev parent reply other threads:[~2014-06-20 23:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 2:28 Samuel Bronson
2014-06-20 14:08 ` Tom Tromey
2014-06-20 23:02 ` Samuel Bronson [this message]
2014-06-28 23:41 ` Samuel Bronson
2014-07-08 1:36 ` Samuel Bronson
2014-07-08 8:50 ` Pedro Alves
2014-07-25 22:40 ` [COMMIT] " Samuel Bronson
2014-06-28 5:11 ` [RFC] " Samuel Bronson
2014-06-28 23:24 ` Samuel Bronson
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=87k38bgp7w.fsf@naesten.mooo.com \
--to=naesten@gmail.com \
--cc=binutils@sourceware.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=gdb-patches@sourceware.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.
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).