diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-02 23:31:52 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-02 23:31:52 -0800 |
| commit | 91917dd58ec5278e555b9c693a830749083e8f89 (patch) | |
| tree | 3b0c8104106f6dec7873378bccc1273e587f6051 /CONTRIBUTE | |
| parent | c988877f436bbbb285a0b34f5e037f7758dd6349 (diff) | |
| parent | 9f2f14a0725211b13a744573344636b57b9c98b9 (diff) | |
Merge branch 'emacs-25-merge'
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 0c0ef207ff..177a38cffd 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 |