Date: Sun, 28 Apr 2024 20:18:08 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Jan Beich <jbeich@freebsd.org> Cc: Emanuel Haupt <ehaupt@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX Message-ID: <CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q@mail.gmail.com> In-Reply-To: <zftd-l564-wny@FreeBSD.org> References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <CAFDf7UJ1xcJLL5t%2BK6VGtN7T4vA9a4TtoRR9pr2N34EcRUO85g@mail.gmail.com> <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> <zftd-l564-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000009a06706172d0054 Content-Type: text/plain; charset="UTF-8" Hello, That said, bug 278589 MFH looks trivial: > > $ git cherry-pick -x 09151791bf5e > $ git reset @~1 > $ git add -p # Skip GNU_CONFIGURE_MANPREFIX part > $ git commit -c @{1} > <Remove GNU_CONFIGURE_MANPREFIX from the commit message> > $ git commit -c @{1} fatal: could not lookup commit '@1' Almost there as I can commit but I lost main commit message. -- Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org --00000000000009a06706172d0054 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello,<br></div><br><div class=3D"gmail_quote"><block= quote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1= px solid rgb(204,204,204);padding-left:1ex"> That said, bug 278589 MFH looks trivial:<br> <br> $ git cherry-pick -x 09151791bf5e<br> $ git reset @~1<br> $ git add -p # Skip GNU_CONFIGURE_MANPREFIX part<br> $ git commit -c @{1}<br> <Remove GNU_CONFIGURE_MANPREFIX from the commit message><br> </blockquote></div><div><br></div><div>$ git commit -c @{1}</div><div>fatal= : could not lookup commit '@1'</div><div><br></div><div>Almost ther= e as I can commit but I lost main commit message.</div><span class=3D"gmail= _signature_prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"= ><div dir=3D"ltr"><div><font color=3D"#888888">Nuno Teixeira</font></div><d= iv><div><font color=3D"#888888"> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h= ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr= eeBSD.org</a><br></font></div></div></div></div></div> --00000000000009a06706172d0054--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q>