From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 01 Aug 2014 21:44:00 GMT
Subject: Re: cherry picking and merge
Message-ID: <xmqq4mxvvqan.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAK3OfOhbJJqLB4yPbuJyufytxNUSBLzKF6axc4jeU7eAjvXtgA@mail.gmail.com>

Nico Williams <nico@cryptonector.com> writes:

> Cherry-picks should record two parents, like merges.

No.

It is OK to record where it came from, and we let you do so with the
"-x" option.

But the "where it came from" commit is very different from being
parent, which implies "all the history behind it".  The whole point
of a cherry-pick is that you do not want to grab the changes behind
the commit you are cherry-picking and you want the _change_ the
cherry-picked commit (and that commit alone) brings in.  It should
never record "two parents, like merges."