Are there settings for a --no-ff merge?