diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-02-19 17:40:41 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-02-19 17:40:41 +0200 |
| commit | 65d8ac7c3729e9416696f77a7add8944e069da92 (patch) | |
| tree | 22b26f5e70b2ef3078d86932d9558d4b3de3f82c | |
| parent | 86fe750260ddcf2e10f445f06a3d07c701f15698 (diff) | |
| download | emacs-65d8ac7c3729e9416696f77a7add8944e069da92.tar.gz | |
Mention in admin/notes/repo how to mark commits that are not to be merged.
| -rw-r--r-- | admin/notes/repo | 4 |
1 files changed, 3 insertions, 1 deletions
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. |