Allow to merge with --ff-only option

Fixing what was said in 

https://github.com/github/hub/issues/426

Sorry for not attaching the issue with this PR - had to use UI in this case.