Addd gmnff gmff alias for git merge --no-ff and --ff
Merge pull request #110 from tuxinaut/master

Git merge aliases