pcottle/learnGitBranching — pull request #136 by nem75 (2013-10-09 20:20:36+00:00)
Title: 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.