Added alias for git merge --no-ff.