How to use lazygit to get the "branch-merged-into-main" curly line representation as that shown on gitgraph in vscode?

[hopezh]

What I did:

(Noted: What's shown on the top half of the image is neovim and lazygit, and the bottom half is gitgraph in vscode.)

1. I have the following test repo with a branch lib:

2. I changed the current branch to main, and I used the M keybinding in lazygit to merge the seleted lib branch into main.

3. Note that in the gitgraph in vscode this merge is shown as a straight line.

What I'm expecting:

4. Doing the same in gitgraph in vscode, we right-click the lib branch and select Merge into current branch...

5. Click Yes, merge for the prompt:

6. We will see that in the gitgraph, this merging action makes lib shown as a curly branching line merged into the straight line on the left. Similar graphic representation is also shown in lazygit

My question:

What is the command/keybinding in lazygit that can achieve the same graphical representations as shown in steps 4 to 6 above, i.e., a curly line, representing the branch being merged, leading back to the straight line on the left, representing the main branch?

[stefanhaller]

It looks like gitgraph is including the --no-ff option in its merge command, and lazygit doesn't. I like lazygit's approach better, because users who want this behavior can configure it on the git level by saying git config --global merge.ff false.

If you don't want to set it globally for all git clients, you can instead configure it for lazygit only by putting

git:
  merging:
    args: '--no-ff'

into your lazygit config file; see https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#default.

[hopezh]

Thanks, @stefanhaller

Yes, as you pointed out, adding --no-ff to args in the config.yaml of lazygit does the trick.

The git cmd is :
git merge [branch-name] --no-ff -m "merge [branch-name]".

I also add the -m option in args of lazygit's config, too. However, I'm not prompted to input a commit message while merging the branch. Do you know how to do this?

[stefanhaller]

There's no way to do that with lazygit. On the command line you would do that by passing --edit, but this has no effect in lazygit because the git command is not attached to a tty in this case.

[hopezh]

Noted with thanks. I think adding --no-ff to args in the config.yml is good enough.