From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Fri, 24 Jun 2005 13:41:46 GMT
Subject: Re: Patch (apply) vs. Pull
Message-ID: <tnxvf4350th.fsf@arm.com>
In-Reply-To: <Pine.LNX.4.21.0506231245560.30848-100000@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> wrote:
> 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.

True. I will remove that. Any commit will have the new base of the
patch as a parent.

> 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.

I can have two commits, one of them accessible via HEAD and the other
stored somewhere under .git/patches. The latter is just a normal
commit where the parent is the current HEAD. This will not be
generated when the patch is re-based, but only when a patch is
modified.

-- 
Catalin