New Git alias for non-FF merges; now just need to get used to using it...