Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch

[Eli Zaretskii]

> Date: Wed, 21 Dec 2022 03:17:44 +0200
> From: Dmitry Gutov <dgutov@yandex.ru>
> 
> > This probably should have been committed to the release branch.  Will
> > the merge scripts cope if I cherry-pick it onto emacs-29?
> 
> To quote admin/notes/git-workflow:
> 
> Backporting to release branch
> =============================
> 
> If you have applied a fix to the master, but then decide that it should
> be applied to the release branch, too, then
> 
> cd ~/emacs/master
> git log
> 
> and find the commit you're looking for.  Then find the commit ID,
> which will look like
> 
> commit 958b768a6534ae6e77a8547a56fc31b46b63710b
> 
> cd ~/emacs/emacs-28
> git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
> 
> and add "Backport:" to the commit string.  Then

Actually, if you use -xe, there's no need for the "Backport" thing,
since gitmerge.el will also recognize the line inserted by -xe.