Re: [PATCH v2 00/12] add --ff option to cherry-pick

From: Paolo Bonzini <bonzini@gnu.org>
Date: Mar 1, 2010, 12:34 UTC
Message-ID: <4B8BB466.1000909@gnu.org>
In-Reply-To: <4B8B78BB.8050008@viscovery.net>

On 03/01/2010 09:20 AM, Johannes Sixt wrote:

Show 6 quoted lines

> Christian Couder schrieb:
>> The goal of this patch series is to make it possible for "git cherry-pick"
>> to fast forward instead of creating a new commit if the cherry picked commit
>> has the same parent as the one we are cherry-picking on.
>
> Why don't you just divert to 'git merge --ff' in this case?

Because the purpose of the series is exactly to replace

   if A^ == HEAD; then
     git merge --ff A   # or git reset --hard A
   else
     git cherry-pick A
   fi

with a single "git cherry-pick --ff A".

An alternative would be the old ff-strategy series which would allow something like

   git merge --ff=only A || git cherry-pick A

Paolo

$ 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.