Add merge --no-ff alias
Merge branch 'merge-alias'