From: Peter Krefting <peter@softwolves.pp.se>
Date: Wed, 09 Dec 2009 13:20:23 GMT
Subject: Re: [PATCH RFC] rebase: add --revisions flag
Message-ID: <alpine.DEB.2.00.0912091414460.470@ds9.cixit.se>
In-Reply-To: <20091209112237.GA27740@atjola.homenet>

Björn Steinbrink:

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

Exactly!

What I meant to say in the original message was that conceptually, the 
difference between a "git rebase --reverse A..B", a "git cherry-pick A..B" 
and a "git merge --squash A..B" is minute.

And when continuing the thought experiment, the step from "git merge 
--squash A..B" to "git merge A..B" is not very large either, just (a 
lot) more difficult to implement.

-- 
\\// Peter - http://www.softwolves.pp.se/