Add ability to merge with --no-ff

[rowanj]

[studious]

+1
From the command line I use the gem git-smart and leverage 'git smart-pull' and 'git smart-merge' as my default strategy.

I'd love to have these options. Fast forwarding branch merges where possible for git pull and and --no-ff for merges.