From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 87488 invoked by alias); 15 Mar 2015 23:03:25 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 87476 invoked by uid 89); 15 Mar 2015 23:03:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-out.m-online.net Received: from mail-out.m-online.net (HELO mail-out.m-online.net) (212.18.0.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (CAMELLIA256-SHA encrypted) ESMTPS; Sun, 15 Mar 2015 23:03:24 +0000 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3l4xBc08Fkz3hmtn; Mon, 16 Mar 2015 00:03:20 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3l4xBb6lMyzvdWd; Mon, 16 Mar 2015 00:03:19 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id MbAwvNavcp7j; Mon, 16 Mar 2015 00:03:19 +0100 (CET) X-Auth-Info: PExSrT4iHRzeX5ocCNg4VvgYkD/nf2L/oTOidfyFSuF8GkTJhjeMG4mq+6ebnUVZ Received: from igel.home (ppp-88-217-116-184.dynamic.mnet-online.de [88.217.116.184]) by mail.mnet-online.de (Postfix) with ESMTPA; Mon, 16 Mar 2015 00:03:19 +0100 (CET) Received: by igel.home (Postfix, from userid 1000) id D96802C3F21; Mon, 16 Mar 2015 00:03:18 +0100 (CET) From: Andreas Schwab To: Joel Sherrill Cc: "gdb\@sourceware.org" , Chris Johns Subject: Re: Cherry Picking git Patches and ChangeLog References: <550609D6.2020003@oarcorp.com> <874mplvq2i.fsf@igel.home> X-Yow: That's a decision that can only be made between you & SY SPERLING!! Date: Sun, 15 Mar 2015 23:03:00 -0000 In-Reply-To: (Joel Sherrill's message of "Sun, 15 Mar 2015 17:46:40 -0500") Message-ID: <87wq2huamh.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2015-03/txt/msg00046.txt.bz2 Joel Sherrill writes: > On March 15, 2015 5:44:21 PM CDT, Andreas Schwab wrote: >>Joel Sherrill writes: >> >>> I know that this is really a git/ChangeLog/patch question but >>> since it comes up in context of gdb, I am asking here. How >>> does one deal with patches that would apply cleanly except >>> for ChangeLog? >> >>git-merge-changelog can help here. > > That will help if we want to manually touch the patches and update them for the tarball. Please explain what you are trying to do. Cherry picking will use the configured merge driver. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."