Never, never, never rebase when pulling