Re: How to "backport" a patch from master to emacs-28?

[Harald Jörg]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> I understand that the usual procedure is to merge _from_ the release
>> branches _to_ master, but that ship has sailed.  Is it ok to cherry-pick
>> the single commit and push it to emacs-28?  It is a trivial patch,
>> below is what "git show" has to say.
>
> Yes, that can be done, indeed.  But please mark it as a "backport".
> Or use `git cherry-pick` which should label it similarly.  This should
> make sure that the next time we merge from emacs-28 back to `master`,
> `gitmerge.el` can automatically skip it to avoid spurious conflicts.

Thanks for the recipe! I've done this now.
-- 
Cheers,
haj