From owner-dev-commits-doc-all@freebsd.org Tue Apr 20 12:56:34 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 6EA015F52B1 for ; Tue, 20 Apr 2021 12:56:34 +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 4FPkGB2gB7z4hpV; Tue, 20 Apr 2021 12:56:34 +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 4E5AB12CFF; Tue, 20 Apr 2021 12:56:34 +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 13KCuYO6005719; Tue, 20 Apr 2021 12:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13KCuYAl005718; Tue, 20 Apr 2021 12:56:34 GMT (envelope-from git) Date: Tue, 20 Apr 2021 12:56:34 GMT Message-Id: <202104201256.13KCuYAl005718@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a527f32556 - main - committers-guide: Bring back MFH metadata field MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a527f3255652174c5a4ac7acdea672ed2a95b21c 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: Tue, 20 Apr 2021 12:56:34 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/doc/commit/?id=a527f3255652174c5a4ac7acdea672ed2a95b21c commit a527f3255652174c5a4ac7acdea672ed2a95b21c Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-04-20 12:42:40 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-04-20 12:56:44 +0000 committers-guide: Bring back MFH metadata field The MFH field is still useful to note that the commit is going to be merged into a quarterly branch. Reported by: mat Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D29862 --- documentation/content/en/articles/committers-guide/_index.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index f0548fbce5..08968c1516 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2584,6 +2584,9 @@ Approved by: re (username) |`MFC with:` |If the commit should be merged together with a previous one in a single MFC commit (for example, where this commit corrects a bug in the previous change), specify the corresponding Git hash. +|`MFH:` +|If the commit is to be merged into a ports quarterly branch name, specify the quarterly branch. For example `2021Q2`. + |`Relnotes:` |If the change is a candidate for inclusion in the release notes for the next release from the branch, set to `yes`.