No more autocommiting noff merges

Instead of just using the automatic commit message I like using the
merge commit as a space to write up a summary of the merged code.