Date: Thu, 7 Oct 2021 10:26:57 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: b4954686bc - main - committers-guide: Mention MFH explicitly Message-ID: <202110071026.197AQvmg020798@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/doc/commit/?id=b4954686bcd36a24a91d4eb33211c0661750d2cb commit b4954686bcd36a24a91d4eb33211c0661750d2cb Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-10-07 10:23:44 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-10-07 10:23:44 +0000 committers-guide: Mention MFH explicitly The process of merging ports commits from the main branch into a quarterly branch is called MFH (Merge From Head) for historical reasons. Mention MFH explicitly in the section describing the procedure so that it's easier to find it. --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 7e7dca0e31..c1a2061c37 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -3790,7 +3790,7 @@ As of November 30, 2020, there is no need to seek explicit approval to commit to [[ports-qa-misc-commit-mfh]] ==== What is the procedure for merging commits to the quarterly branch? -Merging commits to the quarterly branch is very similar to MFC'ing a commit in the src repository, so basically: +Merging commits to the quarterly branch (a process we call MFH for a historical reason) is very similar to MFC'ing a commit in the src repository, so basically: [source,shell] .... % git checkout 2021Q2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110071026.197AQvmg020798>