From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7009 invoked by alias); 28 Jun 2014 23:41:14 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 6960 invoked by uid 89); 28 Jun 2014 23:41:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-qc0-f177.google.com Received: from mail-qc0-f177.google.com (HELO mail-qc0-f177.google.com) (209.85.216.177) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sat, 28 Jun 2014 23:41:07 +0000 Received: by mail-qc0-f177.google.com with SMTP id r5so5750449qcx.36 for ; Sat, 28 Jun 2014 16:41:05 -0700 (PDT) X-Received: by 10.224.11.6 with SMTP id r6mr48986884qar.74.1403998865698; Sat, 28 Jun 2014 16:41:05 -0700 (PDT) Received: from hydrogen (naesten-pt.tunnel.tserv4.nyc4.ipv6.he.net. [2001:470:1f06:57::2]) by mx.google.com with ESMTPSA id e8sm24014140qaa.12.2014.06.28.16.41.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 28 Jun 2014 16:41:04 -0700 (PDT) Received: from naesten by hydrogen with local (Exim 4.82) (envelope-from ) id 1X12Eo-0003EV-75; Sat, 28 Jun 2014 19:40:56 -0400 From: Samuel Bronson 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 References: <87sin0gvr3.fsf@naesten.mooo.com> <87ha3fad30.fsf@fleche.redhat.com> <87k38bgp7w.fsf@naesten.mooo.com> Date: Sat, 28 Jun 2014 23:41:00 -0000 In-Reply-To: <87k38bgp7w.fsf@naesten.mooo.com> (Samuel Bronson's message of "Fri, 20 Jun 2014 19:01:39 -0400") Message-ID: <8738eowqkc.fsf@naesten.mooo.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/msg00240.txt.bz2 Ouch; it looks like my last attempt to reply to this missed gdb-patches@ due to a gmane accident? Samuel Bronson writes: > Tom Tromey writes: >>>>>>> "Samuel" == Samuel Bronson 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! > > -- Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread!