Disable automatic git rebase for merges