From: Eli Zaretskii Date: Sat, 14 Nov 2015 11:52:34 +0000 (+0200) Subject: * CONTRIBUTE (Branches): Improve wording for back-ported commits. X-Git-Tag: emacs-25.0.90~802 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca947054e25fbc11bf8783166153567dcafdbe6c;p=emacs.git * CONTRIBUTE (Branches): Improve wording for back-ported commits. --- diff --git a/CONTRIBUTE b/CONTRIBUTE index 2aae251ce42..8c87df8941e 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