From: J. Bruce Fields <bfields@fieldses.org>
Date: Sun, 15 Apr 2007 23:25:00 GMT
Subject: Re: [PATCH 0/6] Initial subproject support (RFC?)
Message-ID: <20070415232459.GB13515@fieldses.org>
In-Reply-To: <7vabxfp873.fsf@assigned-by-dhcp.cox.net>

On Wed, Apr 11, 2007 at 02:32:48AM -0700, Junio C Hamano wrote:
> David Kågedal <davidk@lysator.liu.se> writes:
> 
> > Junio C Hamano <junkio@cox.net> writes:
> >
> >> ...  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?
> 
> It is probably more Kosher, and I used to always do that, but it
> is much longer to type,

Also remembering which commit you amended is a pain sometimes.  So I
usually do

	git tag base lt/gitlink~3
	git checkout base
	... edit and amend ...
	git rebase --onto HEAD base lt/gitlink
	git tag -d base

But the trick of letting the rebase fail and skipping looks less
cumbersome.

--b.