Merge upgrades

This pull request addresses issue #65

Added support for commit messages (-m) and fast-forward only enforcement (--ff-only) to git merge.