Date: Sun, 28 Apr 2024 21:50:43 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Nuno Teixeira <eduardo@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: <34r5-jmgc-wny@FreeBSD.org> In-Reply-To: <CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q@mail.gmail.com> (Nuno Teixeira's message of "Sun, 28 Apr 2024 20:18:08 %2B0100") References: <202404121936.43CJa5vU012745@gitrepo.freebsd.org> <CAFDf7UJ1xcJLL5t%2BK6VGtN7T4vA9a4TtoRR9pr2N34EcRUO85g@mail.gmail.com> <20240428144959.4fe9e4e0ca163f1dc7b4788a@FreeBSD.org> <zftd-l564-wny@FreeBSD.org> <CAFDf7UJHwsBYMqTsB0YdL=iNH190mwqx7LtZybEOGmb0E48d=Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Nuno Teixeira <eduardo@freebsd.org> writes:
> 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'
Try quoting { and } symbols. Alternatively, use ORIG_HEAD instead of @{1}.
I don't use ORIG_HEAD myself as it may not exist or point to a wrong commit,
and it's hard to remember which Git actions create ORIG_HEAD.
@ is HEAD, @~1 is previous commit, @{1} is previous state of the branch.
For notation details see git-rev-parse(1). For all states see git-reflog(1).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?34r5-jmgc-wny>