don't use rebase as a default; explicitly rebase when needed