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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
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
[-- Attachment #2 --]
<div dir="ltr"><div>Hello,<br></div><br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px 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 there as I can commit but I lost main commit message.</div><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888">
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div></div>;
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q>