Hide commits from log which were brought in via a merge commit

[raiguard]

It often happens that we merge master into a feature branch via merge commits (before we then squash-merge the PR back into master). But when this happens, the useful branch history becomes buried underneath all of the commits that were brought in via the merge. On my coworkers' Git clients and on GitHub, these commits are hidden, but on lazygit they are not.

Is there some mechanism or configuration option I can enable to get this behavior?

[stefanhaller]

No, there is not. My advice is to not merge master into a feature branch, but to rebase the feature branch onto master instead.

[raiguard]

Unfortunately, rebasing is an absolute no-go at my company. I have tried to argue this point in the past and have failed every time.

It doesn't help that I am the only one with this issue, since the rest of the company use other git clients that have "better" behavior.

[stefanhaller]

Wow, you have my full sympathy. I wouldn't want to work there. (Also the squash-merging back to master...)

Sorry, but I have no better advice then.

[raiguard]

Eh, I don't have many issues with the workflow - in fact, I like squashing unless the PRs get unreasonably large (which we try to avoid).

I guess I'll just have to live with the current behavior then. Thanks for the prompt responses!