no fast-forward merges by default. that is a HORRIBLE default.