Added --no-ff option to merge

Since that option is pretty vital to our company's workflow I added it to your wonderful tool.

Would love some feedback if I got it right. Seems to work for me.

Next I might tackle --preserve-merges for rebase.