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 46a9e08c69863af6d4b3f60f43ff4a8b7d80ea8e..65bdd2c2c9821e00b2f598a39da99a8c109c9f16 100644 (file)
--- 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.