git: 6f71dc766b - main - Clarify that the vendor merge commits should have proper commit messages
Mark Johnston <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by markj (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=6f71dc766bc62271cdd74a5ef53fcb641bf4be9c commit 6f71dc766bc62271cdd74a5ef53fcb641bf4be9c Author: Mark Johnston <[email protected]> AuthorDate: 2021-04-13 13:41:03 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2021-04-19 19:54:02 +0000 Clarify that the vendor merge commits should have proper commit messages Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D29745 --- documentation/content/en/articles/committers-guide/_index.adoc | 1 + 1 file changed, 1 insertion(+) 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 _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all To unsubscribe, send any mail to "[email protected]"