From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-109176-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 27514 invoked by alias); 13 Jan 2014 20:33:57 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Received: (qmail 27501 invoked by uid 89); 13 Jan 2014 20:33:57 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_SOFTFAIL autolearn=no version=3.3.2
X-HELO: mtaout21.012.net.il
Received: from mtaout21.012.net.il (HELO mtaout21.012.net.il) (80.179.55.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Jan 2014 20:33:55 +0000
Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0MZC00900X3F2J00@a-mtaout21.012.net.il> for gdb-patches@sourceware.org; Mon, 13 Jan 2014 22:33:53 +0200 (IST)
Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZC0088CX4GSQA0@a-mtaout21.012.net.il>; Mon, 13 Jan 2014 22:33:53 +0200 (IST)
Date: Mon, 13 Jan 2014 20:33:00 -0000
From: Eli Zaretskii <eliz@gnu.org>
Subject: Re: GDB 7.6.90 available for testing
In-reply-to: <52D44439.2020807@redhat.com>
To: Pedro Alves <palves@redhat.com>
Cc: brobecker@adacore.com, gdb-patches@sourceware.org
Reply-to: Eli Zaretskii <eliz@gnu.org>
Message-id: <83ppnv62qh.fsf@gnu.org>
References: <20140108101428.C2280E003F@joel.gnat.com> <831u0ec2y6.fsf@gnu.org> <52D427A4.6010704@redhat.com> <83wqi368k7.fsf@gnu.org> <52D43408.404@redhat.com> <83vbxn67ij.fsf@gnu.org> <83sisr66ci.fsf@gnu.org> <52D44439.2020807@redhat.com>
X-IsSubscribed: yes
X-SW-Source: 2014-01/txt/msg00378.txt.bz2

> Date: Mon, 13 Jan 2014 19:53:29 +0000
> From: Pedro Alves <palves@redhat.com>
> CC: brobecker@adacore.com, gdb-patches@sourceware.org
> 
> On 01/13/2014 07:15 PM, Eli Zaretskii wrote:
> >> Date: Mon, 13 Jan 2014 20:50:28 +0200
> >> From: Eli Zaretskii <eliz@gnu.org>
> >> Cc: brobecker@adacore.com, gdb-patches@sourceware.org
> >>
> >> Is there any difference between merge and cherry-pick in this case?
> 
> merge would attempt to merge the whole of master into the branch
> starting from the branching point.

I meant the other way around: from the branch to master.