From: Junio C Hamano Date: Wed, 21 Jun 2006 11:01:35 GMT Subject: Re: [PATCH (fixed)] rebase: Allow merge strategies to be used when rebasing Message-ID: <7v4pye22nk.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <11508842824018-git-send-email-normalperson@yhbt.net> Eric Wong writes: > 1 - is fixed for --onto usage. More importantly, it used to rebase "side edits further" commit incorrectly in the test sequence -- the commit should only touch "newfile", but it touched "renamed" as well. Your updated patch fixes this problem.