[Emacs-diffs] emacs-25 ca94705: * CONTRIBUTE (Branches): Improve wording for back-ported commits.

[Eli Zaretskii]

branch: emacs-25
commit ca947054e25fbc11bf8783166153567dcafdbe6c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    * CONTRIBUTE (Branches): Improve wording for back-ported commits.
---
 CONTRIBUTE |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 2aae251..8c87df8 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -193,10 +193,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