Re: [PATCH 0/4] reworking git-rebase

From: Sven Verdoolaege <skimo@kotnet.org>
Date: Nov 17, 2005, 10:30 UTC
Message-ID: <20051117103027.GR8383MdfPADPa@greensroom.kotnet.org>
In-Reply-To: <7voe4lfpxm.fsf@assigned-by-dhcp.cox.net>

On Tue, Nov 15, 2005 at 03:32:05PM -0800, Junio C Hamano wrote:

> It notes that fact, and goes ahead to apply D and E, and at the
> very end tells you to deal with C by hand.  Even if you somehow
> managed to replay C on top of the result, you would now end up
> with ...-B-...-U-A-D-E-C.

Actually this is sometimes useful when rewriting history. Suppose you cherry-pick two changes that touch the same piece of code and combine them into a single change and then rebase all your changes on top of this combined change. The two cherry-picked changes will not apply and end up and at the end of the chain where you can simply discard them.

Will the reworked rebase still support this use or is there a better way to do this ?

skimo