Date: Thu, 25 Jun 2020 16:02:17 -0400 From: Ed Maste <emaste@freebsd.org> To: Mitchell Horne <mhorne@freebsd.org> Cc: Renato Botelho <garga@freebsd.org>, freebsd-git@freebsd.org Subject: Re: svn primer translation to git Message-ID: <CAPyFy2DEtfauXXDqc%2BXuuOJVGeJtMaWi5hsd9NChdt1=ot%2BjrA@mail.gmail.com> In-Reply-To: <CADeAsy1P=7RyQoTFutP96=mPtKfoUPUK5GswNZB6L-F=y%2B=_Cw@mail.gmail.com> References: <CAPyFy2Dy4cLQpgUsk_ushXsQFvRPk2S8SEfgWF=0xibGRGJvKw@mail.gmail.com> <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> <CAPyFy2D3hUX=iBEBemJ0aNM5dyGoYZ1--xJonDqjO%2BX6SuM93Q@mail.gmail.com> <CADeAsy1P=7RyQoTFutP96=mPtKfoUPUK5GswNZB6L-F=y%2B=_Cw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 25 Jun 2020 at 09:48, Mitchell Horne <mhorne@freebsd.org> wrote: > > 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. I agree it's unfortunate we can't set repository-level defaults that come along with the initial clone. We could have a script though that users can run to display or adjust the appropriate settings, perhaps. Our standard quickstart instructions could be something like % git clone foo@cgit-beta.freebsd.org/src.git % cd src % sh tools/git-repo-init.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2DEtfauXXDqc%2BXuuOJVGeJtMaWi5hsd9NChdt1=ot%2BjrA>