From owner-freebsd-git@freebsd.org  Thu Jun 25 13:26:14 2020
Return-Path: <owner-freebsd-git@freebsd.org>
Delivered-To: freebsd-git@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6699435B08B
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Thu, 25 Jun 2020 13:26:14 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 49t14P5vd7z44q0;
 Thu, 25 Jun 2020 13:26:13 +0000 (UTC)
 (envelope-from kostikbel@gmail.com)
Received: from tom.home (kib@localhost [127.0.0.1])
 by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 05PDQ6fW034595
 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO);
 Thu, 25 Jun 2020 16:26:09 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 05PDQ6fW034595
Received: (from kostik@localhost)
 by tom.home (8.15.2/8.15.2/Submit) id 05PDQ6bH034594;
 Thu, 25 Jun 2020 16:26:06 +0300 (EEST)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Thu, 25 Jun 2020 16:26:06 +0300
From: Konstantin Belousov <kostikbel@gmail.com>
To: Ed Maste <emaste@freebsd.org>
Cc: Renato Botelho <garga@freebsd.org>, freebsd-git@freebsd.org
Subject: Re: svn primer translation to git
Message-ID: <20200625132606.GB32126@kib.kiev.ua>
References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com>
 <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org>
 <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO+X6SuM93Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO+X6SuM93Q@mail.gmail.com>
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,
 NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home
X-Rspamd-Queue-Id: 49t14P5vd7z44q0
X-Spamd-Bar: ----
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[];
 ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2020 13:26:14 -0000

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

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 ?