Date: Fri, 2 Feb 2024 12:11:53 -0700 From: Warner Losh <imp@bsdimp.com> To: Warner Losh <imp@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5fdf01dbeef1 - main - Revert "stand/lua: always allow overriding with local config files" Message-ID: <CANCZdfoBKQWC-5fmpFrwx%2BxW%2Br7vvO%2B0AAaYFcZQQAmGiHq0mg@mail.gmail.com> In-Reply-To: <202402021906.412J667P054855@gitrepo.freebsd.org> References: <202402021906.412J667P054855@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000002e1e9906106ae361 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Feb 2, 2024 at 12:06=E2=80=AFPM Warner Losh <imp@freebsd.org> wrote= : > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D5fdf01dbeef1f64f8c446561498d662= 702451ac1 > > commit 5fdf01dbeef1f64f8c446561498d662702451ac1 > Author: Warner Losh <imp@FreeBSD.org> > AuthorDate: 2024-02-02 19:01:56 +0000 > Commit: Warner Losh <imp@FreeBSD.org> > CommitDate: 2024-02-02 19:04:57 +0000 > > Revert "stand/lua: always allow overriding with local config files" > > This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe. no mail > sent out, and the commit message was wrong. > Due to conflicts, my pr landing script didn't rewrite the commit message. This occurred to me in the instant after I hit return on git push. My ^C was too late to prevent the deltas from being transmitted and recorded in the repo, but also cut-short the commit hooks that send out the email. My apologies for this lack of attention to detail. Warner --0000000000002e1e9906106ae361 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Fri, Feb 2, 2024 at 12:06=E2=80=AF= PM Warner Losh <<a href=3D"mailto:imp@freebsd.org">imp@freebsd.org</a>&g= t; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p= x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The br= anch main has been updated by imp:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D5fdf01dbeef1f64f8= c446561498d662702451ac1" rel=3D"noreferrer" target=3D"_blank">https://cgit.= FreeBSD.org/src/commit/?id=3D5fdf01dbeef1f64f8c446561498d662702451ac1</a><b= r> <br> commit 5fdf01dbeef1f64f8c446561498d662702451ac1<br> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> AuthorDate: 2024-02-02 19:01:56 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> CommitDate: 2024-02-02 19:04:57 +0000<br> <br> =C2=A0 =C2=A0 Revert "stand/lua: always allow overriding with local co= nfig files"<br> <br> =C2=A0 =C2=A0 This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe.= no mail<br> =C2=A0 =C2=A0 sent out, and the commit message was wrong.<br></blockquote><= div><br></div><div>Due to conflicts, my pr landing script didn't rewrit= e the commit message. This</div><div>occurred to me in the instant after I = hit return on git push. My ^C was too late</div><div>to prevent the deltas = from being transmitted and=C2=A0 recorded in the repo, but</div><div>also c= ut-short the commit hooks that send out the email. My apologies for</div><d= iv>this lack of attention to detail.</div><div><br></div><div>Warner</div><= /div></div> --0000000000002e1e9906106ae361--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoBKQWC-5fmpFrwx%2BxW%2Br7vvO%2B0AAaYFcZQQAmGiHq0mg>