Date: Thu, 25 Jun 2020 10:48:29 -0300 From: Mitchell Horne <mhorne@freebsd.org> 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: <CADeAsy1P=7RyQoTFutP96=mPtKfoUPUK5GswNZB6L-F=y%2B=_Cw@mail.gmail.com> In-Reply-To: <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO%2BX6SuM93Q@mail.gmail.com> References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com> <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO%2BX6SuM93Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADeAsy1P=7RyQoTFutP96=mPtKfoUPUK5GswNZB6L-F=y%2B=_Cw>