git: 652ccfcb23 - main - committers guide: remove "MFC with" tag
Ed Maste <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=652ccfcb237302476b7bc187e1580328729461ba commit 652ccfcb237302476b7bc187e1580328729461ba Author: Ed Maste <[email protected]> AuthorDate: 2023-03-21 19:34:45 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2023-03-21 23:34:48 +0000 committers guide: remove "MFC with" tag "Fixes" and "MFC with" are used for approximately the same purpose, but the former is standard in the Git-based deveopment world. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D39190 --- documentation/content/en/articles/committers-guide/_index.adoc | 3 --- documentation/content/en/articles/committers-guide/_index.po | 6 ------ 2 files changed, 9 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index efdd1d18b0..935541a992 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2545,9 +2545,6 @@ Approved by: re (username) |`MFC to:` |If the commit should be merged to a subset of stable branches, specify the branch names. -|`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`. diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index cd4083faf1..da585d7800 100644 --- a/documentation/content/en/articles/committers-guide/_index.po +++ b/documentation/content/en/articles/committers-guide/_index.po @@ -6311,12 +6311,6 @@ msgstr "" msgid "If the commit should be merged to a subset of stable branches, specify the branch names." msgstr "" -#. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2946 -#, no-wrap -msgid "`MFC with:`" -msgstr "" - #. type: Table #: documentation/content/en/articles/committers-guide/_index.adoc:2948 #, no-wrap