Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jun 2020 21:05:43 +0100
From:      =?utf-8?Q?Bart=C5=82omiej_Rutkowski?= <robak@FreeBSD.org>
To:        Ed Maste <emaste@freebsd.org>
Cc:        Mitchell Horne <mhorne@freebsd.org>, freebsd-git@freebsd.org
Subject:   Re: svn primer translation to git
Message-ID:  <61D3797D-88AD-4005-9DB7-E08B207D666D@FreeBSD.org>
In-Reply-To: <CAPyFy2DEtfauXXDqc%2BXuuOJVGeJtMaWi5hsd9NChdt1=ot%2BjrA@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> <CAPyFy2DEtfauXXDqc%2BXuuOJVGeJtMaWi5hsd9NChdt1=ot%2BjrA@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help


> On 25 Jun 2020, at 21:02, Ed Maste <emaste@freebsd.org> wrote:
>=20
> On Thu, 25 Jun 2020 at 09:48, Mitchell Horne <mhorne@freebsd.org> =
wrote:
>>=20
>> 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.
>=20
> 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
>=20
> % git clone foo@cgit-beta.freebsd.org/src.git
> % cd src
> % sh tools/git-repo-init.sh

Why can't we ship the gitconfig file inside of the repository containing =
the defaults
we'd like to be used?

Kind regards,
Bartek Rutkowski




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?61D3797D-88AD-4005-9DB7-E08B207D666D>