Added alias merge -> merge --no-ff because I don't want to fast-forward
when explicitly doing a merge.