Howto remove the merge commit (diamond) using lazygit

[suntsu42]

I'm starting with the following git log

Goal is to remove the merge commit, but keep all actual commits.

Using the console, i'd do

 git rebase 20a10 feature/testbranc

I can't figure out howto do this operation in lazygit.
I've tried interactive rebase and setting a base commit, but was unable to get the desired result.

How do i get rid of the merge commit using lazygit?

[stefanhaller]

This is a very good question, and I'm afraid the answer is no, there is no way in lazygit to do this currently. The reason is that lazygit insists on adding --rebase-merges to every rebase command. (Which is a good thing, I don't think we should change that.)

If we do #2849 in one way or another, this could help, it would allow users to toggle the --rebase-merges case by case. But then, if users are knowledgeable enough to know that's what they need to do, they might just as well drop down to the command line and do it there.

Or is this a situation that you encounter frequently?

[suntsu42]

Fair enough. I just thought that i missed something.
I'm new to lazygit and tried all the things i normally do in the console.

Or is this a situation that you encounter frequently?

No. I only need this when i made a merge commit by mistake, and it's a simple enough fix in the console.

[duzun]

I've just discovered lazygit today and also thought that I've missed something...

I wanted to remove a lot of merge commits, so I used a hybrid approach:

• in lazygit, find the commit to start with and ctrl+o to copy its hash,
• in CLI: git rebase -i <hash>
• continue solving the conflicts using lazygit