Default to no-ff w/git merges