svn primer translation to git

[Ed Maste]

On Thu, 25 Jun 2020 at 08:56, Renato Botelho <garga at freebsd.org> wrote:
>
> Based on what I saw in other projects when people moved to git, a common
> mistake that happens is people abusing `git pull` and creating merges
> where it's not desired, like in main branch when bringing remote changes
> to local modified repository.  Maybe it's worth to add a paragraph
> saying some words about always use rebase instead of merge.

Indeed - I started touching on that at the beginning, but we need to
make that clear in the day-to-day use example. Probably a broad "never
use git pull" warning too.