This is the mail archive of the
mailing list for the binutils project.
Re: [RFC] Add a .gitattributes file for use with git-merge-changelog
- From: Samuel Bronson <naesten at gmail dot com>
- To: binutils at sourceware dot org
- Cc: gcc-patches at gcc dot gnu dot org, gdb-patches at sourceware dot org
- Date: Sat, 28 Jun 2014 19:40:51 -0400
- Subject: Re: [RFC] Add a .gitattributes file for use with git-merge-changelog
- Authentication-results: sourceware.org; auth=none
- References: <87sin0gvr3 dot fsf at naesten dot mooo dot com> <87ha3fad30 dot fsf at fleche dot redhat dot com> <87k38bgp7w dot fsf at naesten dot mooo dot com>
Ouch; it looks like my last attempt to reply to this missed gdb-patches@
due to a gmane accident?
Samuel Bronson <firstname.lastname@example.org> writes:
> Tom Tromey <email@example.com> writes:
>>>>>>> "Samuel" == Samuel Bronson <firstname.lastname@example.org> 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
> 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!
Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread!