svn primer translation to git

Konstantin Belousov kostikbel at
Thu Jun 25 13:26:14 UTC 2020

On Thu, Jun 25, 2020 at 09:05:51AM -0400, Ed Maste wrote:
> On Thu, 25 Jun 2020 at 08:56, Renato Botelho <garga at> 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.

Isn't it a common (and necessary) practice to disable push of merge
commits and non-ff pushes for master branch of centralized repository,
by commit hooks ? Does the prototype repo enforce such policy ?

More information about the freebsd-git mailing list