From: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed, 09 Dec 2009 11:48:24 GMT
Subject: Re: [PATCH RFC] rebase: add --revisions flag
Message-ID: <m2pr6ocqrb.fsf@igel.home>
In-Reply-To: <20091209112237.GA27740@atjola.homenet>

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"?

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."