Added option --no-ff for git merge

I wrote this because I encountered the need to have this in our projects. Its interesting to use when you are using a Git post hook that pushes to a deployer that deploys only based on a specific branch. Using a branch merge without --no-ff does not send any post commit info because most of the time its a fast-forward.