Merge method "linear history, single commits only"

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Proposal

There should be an additional merge method "linear history, single commits only" that would allow both merge and regular commits, but only allow advancing the target branch by one commit (i.e. if the merge request contains a single commit, it is fast-forwarded, if it contains multiple commits, a merge commit is created).

Our use case is that we have a main project that integrates several others as submodules. With fast-forward merges, it is possible to merge multiple commits at once, where in-between commits are not tested, which is bad for git bisect, so we require merge commits. However, we also have a lot of submodule updates, and creating an extra merge commit for each submodule update is overkill at the same time, especially as each merge will abort auto-merges of other MRs in the same merge train.