On 12.02.24 15:38, Phillip Wood wrote: > Hi Patrick and Stefan > > On 12/02/2024 07:15, Patrick Steinhardt wrote: >> On Sat, Feb 10, 2024 at 10:23:16AM +0100, Stefan Haller wrote: >>> On 09.02.24 17:24, Phillip Wood wrote: >>> 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. >> >> It would be neat indeed if this could be specified in the instruction >> sheet. We already support options for the "merge" instruction, so >> extending "pick" to support options isn't that far-fetched. Then it >> would become possible to say "pick -m1 fa1afe1". > > It would certainly be possible to extend the sequencer to do that but > I'm not familiar with why people use "git cherry-pick -m" [1] so I'm > wondering what this would be used for. It would involve a bit of extra > complexity so I think we'd want a compelling reason as to why > cherry-picking merges without maintaining the topology is useful > especially as one can currently do that via "exec git cherry-pick -m ..." Ok, I suppose the answer will probably not count as a compelling reason. My reason for wanting this is that lazygit currently implements cherry-picking in terms of an interactive rebase, rather then calling git-cherry-pick. And the reason why it does this is that when you cherry-pick multiple commits, and one of them conflicts, then you get lazygit's nice visualization of the rebase todo list to show you where in the sequence you are, what the conflicting commit is, how many are left etc. It just happens to support this well for .git/rebase-merge/git-rebase-todo, but not for .git/sequencer/todo. It probably makes more sense to teach lazygit to visualize the .git/sequencer/todo file, and then use git cherry-pick. See https://github.com/jesseduffield/lazygit/issues/3317 -Stefan
