Hi Phillip, On Sat, May 11, 2024 at 04:01:18PM GMT, Phillip Wood wrote: > 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.
Attachment:
signature.asc
Description: PGP signature