From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?=22Peter_Valdemar_M=F8rch_=28Lists=29=22?= <4ux6as402@sneakemail.com> Subject: Re: git merge after git cherry-pick? Date: Wed, 23 Jul 2008 21:35:58 +0200 Message-ID: <4887881E.6070702@sneakemail.com> References: <48876709.3090504@sneakemail.com> <20080723175600.GL22606@neumann> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: =?ISO-8859-1?Q?SZEDER_G=E1bor?= X-From: git-owner@vger.kernel.org Wed Jul 23 21:37:14 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KLk94-0004zw-JA for gcvg-git-2@gmane.org; Wed, 23 Jul 2008 21:37:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753570AbYGWTgH convert rfc822-to-quoted-printable (ORCPT ); Wed, 23 Jul 2008 15:36:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753587AbYGWTgG (ORCPT ); Wed, 23 Jul 2008 15:36:06 -0400 Received: from morch.com ([193.58.255.207]:51356 "EHLO morch.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753553AbYGWTgF (ORCPT ); Wed, 23 Jul 2008 15:36:05 -0400 Received: from [192.168.1.214] (ANice-157-1-140-70.w90-52.abo.wanadoo.fr [90.52.83.70]) by morch.com (Postfix) with ESMTP id 6DC462841; Wed, 23 Jul 2008 21:37:47 +0200 (CEST) User-Agent: Thunderbird 2.0.0.14 (X11/20080502) In-Reply-To: <20080723175600.GL22606@neumann> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: SZEDER G=E1bor szeder-at-ira.uka.de |Lists| wrote: > You could use 'git rebase' for that. *Exactly* what I was looking for. Now I know what rebase is for! Thanks= =2E Peter --=20 Peter Valdemar M=F8rch http://www.morch.com