From: Daniel Barkalow <barkalow@iabervon.org>
Date: Thu, 23 Jun 2005 17:05:03 GMT
Subject: Re: Patch (apply) vs. Pull
Message-ID: <Pine.LNX.4.21.0506231245560.30848-100000@iabervon.org>
In-Reply-To: <tnxr7et9su7.fsf@arm.com>

On Thu, 23 Jun 2005, Catalin Marinas wrote:

> Actually StGIT still lists the old commit as the 2nd parent since I
> want to implement a log command which can also show only the commits
> against a single patch. If this 2nd parent would not be stored,
> pushing a patch onto the stack when its base was changed would reset
> all the history for that patch.

I think that it's important to avoid having the array of "rebased the
patch" commits be reachable from the final series if that series is going
to be merged into the mainline at the end.

If you want to keep the history of a patch, you should be able to do it by
rebasing that history as well as the latest patch, so you'd get a
two-parent commit with two rebased parents when you rebased a two-parent
commit.

	-Daniel
*This .sig left intentionally blank*