git primer: Update info about rebasing in a few places

Experience has shown that some of the advice in this primer is awkward
and clunky. Address some of that by refining what we suggest.

Sponsored by: Netflix