Add pull.rebase = preserve