mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Mention in admin/notes/repo how to mark commits that are not to be merged.

Browse Source
This commit is contained in:
Eli Zaretskii 2015-02-19 17:40:41 +02:00
parent 86fe750260
commit 65d8ac7c37
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/notes/repo
View File

@ -82,7 +82,9 @@ The exception is, if you know that the change will be difficult to
merge to the trunk (eg because the trunk code has changed a lot).
In that case, it's helpful if you can apply the change to both trunk
and branch yourself (when committing the branch change, indicate
in the commit log that it should not be merged to the trunk; see below).
in the commit log that it should not be merged to the trunk, by
including the phrase "Not to be merged to master", or any other phrase
that matches "merge").
* Installing changes from your personal branches.