diff options
| author | Warner Losh <imp@FreeBSD.org> | 2021-03-18 20:45:46 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2021-03-18 20:45:46 +0000 |
| commit | 28d4e1377abb15ab0e2222035be0289725d4218e (patch) | |
| tree | c389efc86bd34b5568b4194f2e8d6a4dfc5b8f47 | |
| parent | 0181ba16117f05569d0ebd7989dd53bae1821598 (diff) | |
| download | doc-28d4e1377abb15ab0e2222035be0289725d4218e.tar.gz doc-28d4e1377abb15ab0e2222035be0289725d4218e.zip | |
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.
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 3 |
1 files changed, 1 insertions, 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 |