X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d259328fb87db8cc67d52771efcfa653e52c5b71..9f2f14a0725211b13a744573344636b57b9c98b9:/CONTRIBUTE

diff --git a/CONTRIBUTE b/CONTRIBUTE
index b385d68c98..c9c4b74f09 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -186,10 +186,12 @@ branch later.
 
 However, if you know that the change will be difficult to merge to the
 trunk (eg because the trunk code has changed a lot), you can apply the
-change to both trunk and branch yourself.  Indicate in the release
-branch commit log that there is no need to merge the commit to the
-trunk; start the commit message with "Backport:".  gitmerge.el will
-then exclude that commit from the merge to trunk.
+change to both trunk and branch yourself.  It could also happen that a
+change is cherry-picked from master to the release branch, and so
+doesn't need to be merged back.  In these cases, indicate in the
+release branch commit log that there is no need to merge the commit to
+the trunk; start the commit message with "Backport:".  gitmerge.el
+will then exclude that commit from the merge to trunk.
 
 
 ** Other process information