Re: git: 4ab6c1871671 - main - */*: Remove GNU_CONFIGURE_MANPREFIX
Date: Sun, 28 Apr 2024 19:50:43 UTC
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).