From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Wed, 09 Dec 2009 12:06:10 GMT
Subject: Re: [PATCH RFC] rebase: add --revisions flag
Message-ID: <20091209120610.GA29430@atjola.homenet>
In-Reply-To: <m2pr6ocqrb.fsf@igel.home>

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