diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-04-13 13:41:03 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-04-19 19:54:02 +0000 |
| commit | 6f71dc766bc62271cdd74a5ef53fcb641bf4be9c (patch) | |
| tree | 2f9e0291003e34db7061e2197f65e374ce5ba433 | |
| parent | f4353eecab740032fcf800127b9f1d33140e00cc (diff) | |
| download | doc-6f71dc766bc62271cdd74a5ef53fcb641bf4be9c.tar.gz doc-6f71dc766bc62271cdd74a5ef53fcb641bf4be9c.zip | |
Clarify that the vendor merge commits should have proper commit messages
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D29745
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 062399a010..23c1da10e9 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -1215,6 +1215,7 @@ The sources live in `contrib/mtree` since it is upstream software. This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch. If there were conflicts, you would need to fix them before committing. +Include details about the changes being merged in the merge commit message. ==== Rebasing your change against latest FreeBSD source tree |