Re: [PATCH 0/6] Initial subproject support (RFC?)

From: Junio C Hamano <junkio@cox.net>
Date: Apr 11, 2007, 09:32 UTC
Message-ID: <7vabxfp873.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <87d52bib9e.fsf@morpheus.local>

David Kågedal <davidk@lysator.liu.se> writes:

Show 14 quoted lines

> 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, and I use both perhaps 50%/50% depending on the mood.

When the fix-up only adds stuff, 3-way merge would say that the commit before fixing up (lt/gitlink~3 in our example, which you are explicitly excluding, while I am letting rebase to see it) has already been applied, in which case the procedure would not even stop. The case illustrated in my message which only adds a forgotten line "fclose(f)" falls into that category.