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

quoted text
> $ 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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html