From: Junio C Hamano <junkio@cox.net>
Date: Sat, 18 Feb 2006 07:39:21 GMT
Subject: Re: Why can't git-rebase back up?
Message-ID: <7vmzgpru8m.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060217135938.7412.qmail@science.horizon.com>

linux@horizon.com writes:

> But suppose discover a nasty bug in -rc3 and want to move my build branch
> back to -rc2.  "git-rebase v2.6.16-rc2" does nothing.  After a bit
> of thought, I realize why, but sometime I do want to back up.
>
> What's the best way to do that?  Should git-rebase take an optional
> third argument which is the branch head we are moving away from?
> E.g. what I want to do would be
>
> 	git-rebase v2.6.16-rc2 build v2.6.16-rc3

The one in "next" has a topic branch change which lets you say:

	$ git rebase --onto v2.6.16-rc2 v2.6.16-rc3 build

which is a shorthand for

	$ git checkout build
	$ git rebase --onto v2.6.16-rc2 v2.6.16-rc3

That is, tear out my changes that forked from the development
trail that led to v2.6.16-rc3, and graft them on top of
v2.6.16-rc2.