Date: Wed, 30 Dec 2020 11:06:51 +0100 From: Eric Masson <emss@free.fr> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: Poul-Henning Kamp <phk@phk.freebsd.dk>, Warner Losh <imp@bsdimp.com>, Glen Barber <gjb@freebsd.org>, Kyle Evans <kevans@freebsd.org>, "Rodney W. Grimes" <rgrimes@freebsd.org>, src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 70e64ba44941 - main - release.sh: Update GITROOT URL Message-ID: <864kk3fw04.fsf@srvbsdfenssv.interne.associated-bears.org> In-Reply-To: <20201230090913.GA90119@FreeBSD.org> (Alexey Dokuchaev's message of "Wed, 30 Dec 2020 09:09:13 %2B0000") References: <202012291441.0BTEf1X9009764@gitrepo.freebsd.org> <202012300018.0BU0I7gn079533@gndrsh.dnsmgr.net> <CACNAnaF0pMGzZRsHueR_o-xwD_CjX6yyHqO-SNGTPy3tsinLAg@mail.gmail.com> <20201230022128.GE1206@FreeBSD.org> <CANCZdfoE5KuWPHNmqK1=W0TW6LE8sxwBV51SndoDYwE3zXyFOw@mail.gmail.com> <15826.1609318943@critter.freebsd.dk> <20201230090913.GA90119@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Alexey Dokuchaev <danfe@freebsd.org> writes: Hi, > What about mergemaster -F, on a related note? Did my first build based on git checkout STABLE/12 src yesterday, F flag really helped in mergemaster stage (mergemaster -iFU), only had to merge the usual local mods. Éric
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?864kk3fw04.fsf>