bug#22891:

[Eli Zaretskii]

> Date: Tue, 26 Apr 2016 23:07:20 +0200
> From: Anders Lindgren <andlind@gmail.com>
> Cc: martin rudalics <rudalics@gmx.at>, 22891@debbugs.gnu.org, 
>       Constantine Vetoshev <vetoshev@gmail.com>
> 
>  Cherry-pick, not merge. With a "backport" in the log message, please.
> 
> Unfortunately, I'm new to git, so I have to read up on how to do that.

In a nutshell, do the following in the emacs-25 branch's checkout:

   git cherry-pick -x SHA1 -e

where SHA1 is the hash of the commit you want to cherry-pick.  The -e
switch will let you edit the commit message, which is needed for
adding the "backport" thing.

Thanks.