diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:10:25 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:10:25 -0800 |
| commit | c79978fcad84052edbdb78b33f2eaa913acb7cb0 (patch) | |
| tree | 9ddbd26fff5cd824055dfcdee1241f9f44d6a155 /CONTRIBUTE | |
| parent | 73e9edf8d177af9a008faf9642512042c074706a (diff) | |
| parent | dacde7ee5d37a1fe685a489c65678a8f2c2535ce (diff) | |
| download | emacs-c79978fcad84052edbdb78b33f2eaa913acb7cb0.tar.gz | |
Merge from origin/emacs-25
dacde7e * etc/AUTHORS: Update the AUTHORS file
478ca5d ; fix changelog entries
2b7d006 ; make change-history-commit
851decb * lisp/dired-aux.el: Require cl-lib. (Bug#22613)
47896c8 ; Improve commentary in insdel.c
53ca1e1 Index tilde characters in names of backup files
d97f522 Document deprecation of hi-lock-mode's 'C-x w' bindings
b55f06d ; * etc/NEWS: Use double spaces to end a sentence.
28bb214 Announce that the `C-x w' bindings are deprecated
1c98f98 Suppress GNUstep hardening
d82f24b Fix redisplay after a large insertion
85a2753 Revert "Fix gnus-group-get-new-news-this-group on group with
closed server"
e8e3db0 ; Improve merge documentation in CONTRIBUTE
5be9989 * lib-src/make-docfile.c: Include stdarg.h.
c95ebbf Extend gpm-mouse-mode's doc string and doc to point out
limitations.
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 71bbebb7da7..7cb4a1c7544 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -184,15 +184,19 @@ If you are fixing a bug that exists in the current release, be sure to commit it to the release branch; it will be merged to the master 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. 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. - +However, if you know that the change will be difficult to merge to +master (eg because the code on master has changed a lot), you can +apply the change to both master 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 master; start the commit message with "Backport:". +gitmerge.el will then exclude that commit from the merge to trunk. + +Some changes should not be merged to master at all, for whatever +reasons. These should be marked by including something like "Do not +merge to master" or anything that matches gitmerge-skip-regexp (see +gitmerge.el) in the log message. ** Other process information |