git: 28d4e1377a - main - MFC: tweak the langauge

[Warner Losh]

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=28d4e1377abb15ab0e2222035be0289725d4218e

commit 28d4e1377abb15ab0e2222035be0289725d4218e
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-03-18 20:45:46 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-03-18 20:45:46 +0000

    MFC: tweak the langauge
    
    Don't say there are two options and then give only one. Update that
    sentence to reflect where the project seems to have landed in terms of
    how to do MFCs.  The original was written prior to the transtion and the
    existing practice has shifted to cherry-pick -x almost exclusively.
---
 documentation/content/en/articles/committers-guide/_index.adoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 9bf60fefbf..9069eb8f42 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -861,8 +861,7 @@ There are a few options for resolving this:
 ==== Commit message standards
 ===== Marking MFCs
 
-There are two main options for marking MFCs as distinct from direct
-commits:
+The project has adopted the following practice for marking MFCs:
 
 * Use the `-x` flag with `git cherry-pick`.  This adds a line to the
   commit message that includes the hash of the original commit when