From: Jeff King <peff@peff.net>
Date: Tue, 09 Sep 2008 21:09:17 GMT
Subject: Re: [RFC] origin link for cherry-pick and revert
Message-ID: <20080909210917.GA3715@coredump.intra.peff.net>
In-Reply-To: <7vfxo958tj.fsf@gitster.siamese.dyndns.org>

On Tue, Sep 09, 2008 at 02:05:28PM -0700, Junio C Hamano wrote:

> To be consistent, when you are at HEAD and are merging side branch B,
> because that merge is to incorporate what happened on the side branch
> while you are looking the other way, we should say "by the way, the
> difference between state $(git merge-base HEAD B) and state B was used to
> make this commit." in the resulting merge commit, shouldn't we?

I suppose you could, though in that case you can obviously calculate the
merge base yourself from the parents of the merge. The difference with
cherry-picking (or rebasing) is that you might not otherwise know about
the "by the way" commits.

-Peff