Allow to merge with --ff-only option
Merge pull request #427 from lzap/no-ff-option

Allow to merge with --ff-only option