pull --rebase: be cleverer with rebased upstream branches