Re: cherry picking and merge

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 1, 2014, 21:44 UTC
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."

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.