From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <binutils-return-84079-listarch-binutils=sources.redhat.com@sourceware.org>
Received: (qmail 25251 invoked by alias); 20 Jun 2014 14:08:19 -0000
Mailing-List: contact binutils-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <binutils.sourceware.org>
List-Subscribe: <mailto:binutils-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/binutils/>
List-Post: <mailto:binutils@sourceware.org>
List-Help: <mailto:binutils-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: binutils-owner@sourceware.org
Received: (qmail 25096 invoked by uid 89); 20 Jun 2014 14:08:18 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2
X-Spam-User: qpsmtpd, 2 recipients
X-HELO: mx1.redhat.com
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 20 Jun 2014 14:08:17 +0000
Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5KE85Is023790	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);	Fri, 20 Jun 2014 10:08:05 -0400
Received: from barimba (ovpn-113-103.phx2.redhat.com [10.3.113.103])	by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5KE83tB005851	(version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO);	Fri, 20 Jun 2014 10:08:04 -0400
From: Tom Tromey <tromey@redhat.com>
To: Samuel Bronson <naesten@gmail.com>
Cc: binutils@sourceware.org, gdb-patches@sourceware.org,        gcc-patches@gcc.gnu.org
Subject: Re: [RFC] Add a .gitattributes file for use with git-merge-changelog
References: <87sin0gvr3.fsf@naesten.mooo.com>
Date: Fri, 20 Jun 2014 14:08:00 -0000
In-Reply-To: <87sin0gvr3.fsf@naesten.mooo.com> (Samuel Bronson's message of	"Thu, 19 Jun 2014 21:59:19 -0400")
Message-ID: <87ha3fad30.fsf@fleche.redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-SW-Source: 2014-06/txt/msg00182.txt.bz2

>>>>> "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.

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?

Tom