no-ff merge alias

Creating a pull request, but then merging at the command line.