bug#68375: 29.1; lispref documentation fixes

[Eli Zaretskii]

> From: Stephen Berman <stephen.berman@gmx.net>
> Cc: 68375@debbugs.gnu.org,  manphiz@gmail.com
> Date: Thu, 11 Jan 2024 17:39:16 +0100
> 
> On Thu, 11 Jan 2024 17:33:17 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
> 
> >> From: Stephen Berman <stephen.berman@gmx.net>
> >> Cc: 68375@debbugs.gnu.org,  manphiz@gmail.com
> >> Date: Thu, 11 Jan 2024 16:18:48 +0100
> [...]
> >> >> I thought I'd save you some work by installing the patch myself,
> >> >> which I just did, but unfortunately to master instead of emacs-29
> >> >> (and also forgot to add the bug number).  Should I revert it and
> >> >> install to the release branch?  Sorry for the trouble.
> >> >
> >> > You could have simply cherry-picked it to emacs-29.
> >>
> >> Is it possible to do that with VC?
> >
> > No, not that I know of.
> 
> Pity.
> 
> >> I didn't find the term in the source code, only in
> >> admin/notes/git-workflow, which only shows the git command (and says
> >> to "add 'Backport:' to the commit string", which is another
> >> attention block I could well stumble over...).
> >
> > If you cherry-pick with the -x option, gitmerge.el will recognize the
> > cherry-picks automatically, and there's no need for the "backport"
> > indication.
> 
> Ah, ok.  But then shouldn't that directive be removed from the text,
> since the example invocation has the -x option?

Maybe.  It does no harm, though.