From owner-dev-commits-doc-all@freebsd.org Mon Apr 19 19:54:33 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 78E955FDC18 for ; Mon, 19 Apr 2021 19:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPHZx33zBz4nx4; Mon, 19 Apr 2021 19:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C04025517; Mon, 19 Apr 2021 19:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13JJsXQD053420; Mon, 19 Apr 2021 19:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JJsXEL053419; Mon, 19 Apr 2021 19:54:33 GMT (envelope-from git) Date: Mon, 19 Apr 2021 19:54:33 GMT Message-Id: <202104191954.13JJsXEL053419@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mark Johnston Subject: git: 6f71dc766b - main - Clarify that the vendor merge commits should have proper commit messages MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f71dc766bc62271cdd74a5ef53fcb641bf4be9c Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 19:54:33 -0000 The branch main has been updated by markj (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=6f71dc766bc62271cdd74a5ef53fcb641bf4be9c commit 6f71dc766bc62271cdd74a5ef53fcb641bf4be9c Author: Mark Johnston AuthorDate: 2021-04-13 13:41:03 +0000 Commit: Mark Johnston 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