Agree with what fpgeek said, and I would add further that rebasing by default for pull, certainly does not preclude you from using local-only feature branches!