Re: git-cherry-pick(1) -- path

From: Alejandro Colomar <alx@kernel.org>
Date: May 11, 2024, 20:08 UTC
Message-ID: <fz7tgtvp6qp7h3vcaviibn3rktkwg5q4qjeuvmciejqn2m7uow@3o5hi6hdbkt5>
In-Reply-To: <3a48b2fe-78c0-41f4-9e60-4146f15dfa97@gmail.com>

Hi Phillip,

On Sat, May 11, 2024 at 04:01:18PM GMT, Phillip Wood wrote:

Show 5 quoted lines

> sequencer.c. If we go for the "write new trees and use those in the merge"
> approach then we'd need to change do_pick_commit() to create the trees and
> we'd probably want to change do_recursive_merge() to take trees rather than
> commits. We'd also need to add a new pathspec member to struct replay_opts
> to pass the pathspec around.

I've been thinking this evening that since `git format-patch ... | git am -3` works so well, and since the behavior of cherry-pick -- path isn't so obvious (we're discussing different strategies), maybe we should just not do it. I fell in love with am -3.

:-3

Have a lovely night! Alex

-- 
<https://www.alejandro-colomar.es/>
A client is hiring kernel driver, mm, and/or crypto developers;
contact me if interested.