From: Michael S. Tsirkin <mst@redhat.com>
Date: Wed, 09 Dec 2009 12:07:48 GMT
Subject: Re: [PATCH RFC] rebase: add --revisions flag
Message-ID: <20091209120748.GI2977@redhat.com>
In-Reply-To: <20091209120610.GA29430@atjola.homenet>

On Wed, Dec 09, 2009 at 01:06:10PM +0100, Björn Steinbrink wrote:
> On 2009.12.09 12:48:24 +0100, Andreas Schwab wrote:
> > Björn Steinbrink <B.Steinbrink@gmx.de> writes:
> > 
> > > Err, no. "git merge --squash foo" merges all changes from the merge base
> > > of HEAD and foo up to foo. "git cherry-pick foo" takes just the changes
> > > from foo^ to foo. For example:
> > >
> > > A---B---C (master)
> > >  \
> > >   D---E---F (foo)
> > >
> > > git cherry-pick foo # Tries to create a new commit with the changes from
> > >                     # "git diff D F"
> > 
> > Did you mean "git diff E F"?
> 
> Ugh, yes, of course. Thanks.
> 
> Björn

So this will be best written as
git cherry-pick ..foo

-- 
MST