Re: Interactive rebase: using "pick" for merge commits
- From
- Stefan Haller <lists@haller-berlin.de>
- Date
- Feb 10, 2024, 09:23 UTC
- Message-ID
- <65c65f6b-5ec8-4fa0-a17c-0f2c0d32b390@haller-berlin.de>
- In-Reply-To
- <ad561600-faf6-4d3c-80b2-34b3d1a1b99e@gmail.com>
On 09.02.24 17:24, Phillip Wood wrote:
Show 14 quoted lines
> On 09/02/2024 15:52, Stefan Haller wrote: >> When I do an interactive rebase, and manually enter a "pick" with the >> commit hash of a merge commit, I get the following confusing error >> message: >> >> error: commit fa1afe1 is a merge but no -m option was given. >> >> Is it crazy to want pick to work like this? Should it be supported? > > It causes problems trying to maintain the topology. In the past there > was a "--preserve-merges" option that allowed one to "pick" merges but > it broke if the user edited the todo list. The "--rebase-merges" option > was introduced with the "label", "reset" and "merge" todo list > instructions to allow the user to control the topology.
Yes, I'm familiar with all this, but that's not what I mean. I don't want to maintain the topology here, and I'm also not suggesting that git itself generates such "pick" entries with -mX arguments (maybe I wasn't clear on that). What I want to do is to add such entries myself, as a user, resulting in the equivalent of doing a "break" at that point in the rebase and doing a "git cherry-pick -mX <hash-of-merge-commit>" manually.
-Stefan