From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23441 invoked by alias); 8 Jul 2014 01:36:13 -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 23370 invoked by uid 89); 8 Jul 2014 01:36:07 -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-qa0-f47.google.com Received: from mail-qa0-f47.google.com (HELO mail-qa0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 08 Jul 2014 01:36:04 +0000 Received: by mail-qa0-f47.google.com with SMTP id hw13so4227631qab.20 for ; Mon, 07 Jul 2014 18:36:02 -0700 (PDT) X-Received: by 10.224.120.193 with SMTP id e1mr56027190qar.42.1404783362480; Mon, 07 Jul 2014 18:36:02 -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 p21sm27711497qgp.14.2014.07.07.18.36.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 07 Jul 2014 18:36:01 -0700 (PDT) Received: from naesten by hydrogen with local (Exim 4.82) (envelope-from ) id 1X4KK7-0000O1-5L; Mon, 07 Jul 2014 21:35:59 -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> <8738eowqkc.fsf@naesten.mooo.com> Date: Tue, 08 Jul 2014 01:36:00 -0000 In-Reply-To: <8738eowqkc.fsf@naesten.mooo.com> (Samuel Bronson's message of "Sat, 28 Jun 2014 19:40:51 -0400") Message-ID: <87oax0k4xt.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-07/txt/msg00088.txt.bz2 Ping? If nobody has anything else to say, I'm going to assume that such a change is unobjectionable, and should not be listed in the ChangeLog. Samuel Bronson writes: > 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!