gm alias now defaults to git merge --no-ff