From: Eli Zaretskii Date: Thu, 19 Feb 2015 15:40:41 +0000 (+0200) Subject: Mention in admin/notes/repo how to mark commits that are not to be merged. X-Git-Tag: emacs-24.4.91~17 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65d8ac7;p=emacs.git Mention in admin/notes/repo how to mark commits that are not to be merged. --- diff --git a/admin/notes/repo b/admin/notes/repo index 46a9e08c698..65bdd2c2c98 100644 --- a/admin/notes/repo +++ b/admin/notes/repo @@ -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.