Merge method: Merge commit if cannot fast-forward (git merge --ff)

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

• Close this issue

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