From: Bernhard R. Link <brl@pcpool00.mathematik.uni-freiburg.de>
Date: Fri, 18 Dec 2009 14:47:57 GMT
Subject: Re: [PATCH] Let format-patch and rebase ignore trivial merges.
Message-ID: <20091218144756.GA7211@pcpool00.mathematik.uni-freiburg.de>
In-Reply-To: <4B2B8213.1090104@viscovery.net>

* Johannes Sixt <j.sixt@viscovery.net> [091218 14:22]:
> > format-patch has to choose a parent. Choosing the first one make the
> > most sense for me (as the first is the only real 'special' one).
> > In the workflows I envision the first parent would also be the one with
> > the clean history.
>
> Then use
>
>    git format-patch --first-parent upstream..

As already described in the thread my mail contained a link to, this
will miss patches if there were also real merges (which there will).

But the point that there is only a --first-parent and no --last-parent
shows that the first parent is special, so format-patch should choose
the first one.

Hochachtungsvoll,
	Bernhard R. Link
-- 
Please do not CC me if also sending to git@vger.kernel.org.