Merge squash

[mark2185]

Discussed in https://github.com/jesseduffield/lazygit/discussions/1296

^{Originally posted by mestihudson April 26, 2021} Is there a way to get a git merge <branch> --squash? I know that is possible to use a custom command, but I'd like to follow the lazygit way.

Thanks for this awesome tool.

[mark2185]

I recommend creating a menu under M in which we'd have options such as:

• m would merge as usual
• s would merge with --squash
• n for --no-commit,
• e for --edit

I don't know, surely people will think of something.

@jesseduffield what do you say about moving this to the m key, and having the current m (Rebase options) appear only when in a rebase/merge context? Is that easily doable?

I remember reading about that somewhere...

Closing this should also close #650.

[9mm]

this would be reallllly sweet

[jesseduffield]

@mark2185 all those options are orthogonal so it sounds like we'll need to solve https://github.com/jesseduffield/lazygit/issues/2849 before we can do this (not necessarily the 'complex mode' thing but the menu that lets you configure different args before confirming an action)

[all500234765]

bump, would love to see this too

[ofurtumi]

bump, this would be really great