From: David Kågedal <davidk@lysator.liu.se>
Date: Wed, 11 Apr 2007 08:08:29 GMT
Subject: Re: [PATCH 0/6] Initial subproject support (RFC?)
Message-ID: <87d52bib9e.fsf@morpheus.local>
In-Reply-To: <7vk5wkuf35.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

> $ git rebase HEAD lt/gitlink
> 
> This will take us back on lt/gitlink branch, set the tip of the
> branch to the commit we just made with the fix-up, and the first
> round will try to apply the change lt/gitlink~3 brings in on top
> of our HEAD.  This _will_ fail, but that is to be expected, as
> we intend to replace that with what we just amended.  Just reset
> it away and keep going.
> 
> $ git reset --hard
> $ git rebase --skip

Wouldn't

$ git rebase --onto HEAD lt/gitlink~3 lt/gitlink

do the trick in one step?

-- 
David Kågedal