Add a strict-merge alias

Useful for gitflow-style development, where you always want merges to be
preserved, so you can see how commits were grouped.