new Feature/merge without fast forward

[DFOXpro]

TLDR: adds a new options that render:
$ git branchName --no-ff
_also menu > merge is now a submenu _

This feature for some development teams is intended to acomplish a better cvs management
Info:

• Here
• and here

[DFOXpro]

Any feedback from the repo admins?

[squaremarco]

This should be the default behaviour to be honest. I've implemented the same functionality adding a checkbox within the package settings but I think this is a more elegant way to solve the 'issue'.

[akonwi]

If the goal is to override git's default settings, would it be better to change the git config file for the specific repo?

Adding this option to your local config file solves the problem. The branch name is optional.

[branch "master"]
  mergeOptions = --no-ff

[DFOXpro]

This is more an usability options, with many projects we decide if we need a FF or no-FF merge (is situational) so, this feature became usefull