diff options
| author | Eli Zaretskii | 2015-11-14 13:52:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-11-14 13:52:34 +0200 |
| commit | ca947054e25fbc11bf8783166153567dcafdbe6c (patch) | |
| tree | 2c4ef8cb84dc30c64de11b53b5db95b3fb702caf /CONTRIBUTE | |
| parent | f234fc2cb319de1e5e2eca1a84450ec220ce7955 (diff) | |
| download | emacs-ca947054e25fbc11bf8783166153567dcafdbe6c.tar.gz emacs-ca947054e25fbc11bf8783166153567dcafdbe6c.zip | |
* CONTRIBUTE (Branches): Improve wording for back-ported commits.
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 2aae251ce42..8c87df8941e 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE | |||
| @@ -193,10 +193,12 @@ branch later. | |||
| 193 | 193 | ||
| 194 | However, if you know that the change will be difficult to merge to the | 194 | However, if you know that the change will be difficult to merge to the |
| 195 | trunk (eg because the trunk code has changed a lot), you can apply the | 195 | trunk (eg because the trunk code has changed a lot), you can apply the |
| 196 | change to both trunk and branch yourself. Indicate in the release | 196 | change to both trunk and branch yourself. It could also happen that a |
| 197 | branch commit log that there is no need to merge the commit to the | 197 | change is cherry-picked from master to the release branch, and so |
| 198 | trunk; start the commit message with "Backport:". gitmerge.el will | 198 | doesn't need to be merged back. In these cases, indicate in the |
| 199 | then exclude that commit from the merge to trunk. | 199 | release branch commit log that there is no need to merge the commit to |
| 200 | the trunk; start the commit message with "Backport:". gitmerge.el | ||
| 201 | will then exclude that commit from the merge to trunk. | ||
| 200 | 202 | ||
| 201 | 203 | ||
| 202 | ** Other process information | 204 | ** Other process information |