From owner-freebsd-git@freebsd.org  Thu Jun 25 13:48:41 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 0746835B4AB
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Thu, 25 Jun 2020 13:48:41 +0000 (UTC)
 (envelope-from mhorne@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (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-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49t1ZJ6Qhvz45nx;
 Thu, 25 Jun 2020 13:48:40 +0000 (UTC)
 (envelope-from mhorne@freebsd.org)
Received: from mail-yb1-f181.google.com (mail-yb1-f181.google.com
 [209.85.219.181])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 (Authenticated sender: mhorne)
 by smtp.freebsd.org (Postfix) with ESMTPSA id D27392BCAF;
 Thu, 25 Jun 2020 13:48:40 +0000 (UTC)
 (envelope-from mhorne@freebsd.org)
Received: by mail-yb1-f181.google.com with SMTP id t9so2770310ybk.9;
 Thu, 25 Jun 2020 06:48:40 -0700 (PDT)
X-Gm-Message-State: AOAM532kQ3LSifJPie9yklpn0sLKc2Z6hzo+IC+zyRzYinqT3Q01z3dC
 wjG3V/oCJzODEXU2/MvyKfEMe1V6fx2Rp4siBSA=
X-Google-Smtp-Source: ABdhPJxxb1WLYSVeVm9xK7CcPl5vM6qV5AFrIxXLFu9LnRkOscxcqc5ulXmkIRKu1KqPyQ1IR0fEG1qRI529733hWf8=
X-Received: by 2002:a25:e8b:: with SMTP id 133mr51915057ybo.13.1593092920307; 
 Thu, 25 Jun 2020 06:48:40 -0700 (PDT)
MIME-Version: 1.0
References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com>
 <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org>
 <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO+X6SuM93Q@mail.gmail.com>
In-Reply-To: <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO+X6SuM93Q@mail.gmail.com>
From: Mitchell Horne <mhorne@freebsd.org>
Date: Thu, 25 Jun 2020 10:48:29 -0300
X-Gmail-Original-Message-ID: <CADeAsy1P=7RyQoTFutP96=mPtKfoUPUK5GswNZB6L-F=y+=_Cw@mail.gmail.com>
Message-ID: <CADeAsy1P=7RyQoTFutP96=mPtKfoUPUK5GswNZB6L-F=y+=_Cw@mail.gmail.com>
Subject: Re: svn primer translation to git
To: Ed Maste <emaste@freebsd.org>
Cc: Renato Botelho <garga@freebsd.org>, freebsd-git@freebsd.org
Content-Type: text/plain; charset="UTF-8"
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:48:41 -0000

On Thu, Jun 25, 2020 at 10:06 AM Ed Maste <emaste@freebsd.org> 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.

We should advise users to set pull.rebase in their configuration,
either globally in ~/.gitconfig or on the repository-level in
.git/config. It seems that newer versions of git will print a warning
if neither pull.ff or pull.rebase is set. It's unfortunate that we
can't include config files as part of the repository, so this will
always need to be done manually.

> _______________________________________________
> freebsd-git@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-git
> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org"