aboutsummaryrefslogtreecommitdiffstats
path: root/docs/submittingpatches.rst
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2020-06-07 17:57:52 +0200
committerMarge Bot <[email protected]>2020-06-19 19:51:53 +0000
commit7488d491072cbd98e3bfc6d39b2ca10504572e72 (patch)
treeb9fc6a01c5c4446b0b67579812c85e29cfa7b3ad /docs/submittingpatches.rst
parent731465192a995e5448d015303ab8e4307a101b81 (diff)
docs: make it clear that the tags needs to be in the commit message
Some people have been putting them only in the MR description, which isn't picked up by our tools. (Note that doing both doesn't hurt.) Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5378>
Diffstat (limited to 'docs/submittingpatches.rst')
-rw-r--r--docs/submittingpatches.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/submittingpatches.rst b/docs/submittingpatches.rst
index 1556226ddec..984c0aa3186 100644
--- a/docs/submittingpatches.rst
+++ b/docs/submittingpatches.rst
@@ -64,7 +64,7 @@ Patch formatting
something else.
- If a patch addresses a issue introduced with earlier commit, that
- should be noted in the patch comment. For example:
+ should be noted in the commit message. For example:
::
@@ -254,9 +254,9 @@ Nominating a commit for a stable branch
There are several ways to nominate a patch for inclusion in the stable
branch and release. In order or preference:
-- By adding the ``Fixes:`` tag as described above, if you are fixing
+- By adding the ``Fixes:`` tag in the commit message as described above, if you are fixing
a specific commit.
-- By adding the ``Cc: mesa-stable`` tag as described below.
+- By adding the ``Cc: mesa-stable`` tag in the commit message as described below.
- By submitting a merge request against the ``staging/year.quarter``
branch on gitlab.