Introduce git merge --squash

Problem to solve

In a popular issue Squash merge MRs without merge commit, users expressed the desire to be able to merge without the need to create a merge commit.

Proposed solution

Introduce git merge --squash for scenarios not addressed by our current settings (without Fast forward

Merge commit should remain as the default