<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=14596) </details> <!--IssueSummary end--> Currently we have the following options in edit project settings: - Merge commit (git merge --no-ff) - Merge commit with semi-linear history (???) - Fast-forward merge (git merge --ff-only) What's missing is the default merge behaviour: - Merge commit if cannot fast-forward (git merge) (git merge --ff) Here's a link to a list of merge options: https://git-scm.com/docs/git-merge This 4th option would be most useful to me, and should be implemented. I grepped the source code for those current 3 options and I can't seem to find them. ##### Customers https://gitlab.my.salesforce.com/00161000004xUPr