Subject: Re: cherry picking and merge

From: Junio C Hamano <[email-masked]>
Date: Fri, 01 Aug 2014 14:44:00 -0700

Nico Williams <[email-masked]> 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."