don't force --rebase