Addd gmnff gmff alias for git merge --no-ff and --ff