Re: Question about merge & cherry pick

From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Nov 7, 2024, 12:02 UTC
Message-ID: <ZyysPeBRXvTAxLVf@tapette.crustytoothpaste.net>
In-Reply-To: <a129e967-efba-48ba-b5a0-1abbb0af5c9d@maurel.me>

On 2024-11-07 at 10:32:06, Julien Maurel wrote:

> Ok, I didn't have this vision about how merge is apply, thanks.
> There is no option to merge by considering each commit individually ?
> Rebase do it but not applicable in my case :)

There's no way to do a merge commit-by commit. The recommendation is to do a rebase, since it essentially does a commit-by-commit merge under the hood (due to using the merge machinery). The title of the FAQ entry at [0] doesn't perfectly describe your case, but it does sort of explain it and it explains how the merge and rebase machinery works.

[0] https://git-scm.com/docs/gitfaq#merge-two-revert-one

-- 
brian m. carlson (they/them or he/him)
Toronto, Ontario, CA