docs: use multiple background-images for header

[mesa.git] / docs / submittingpatches.html

diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 61c6d1f88060c5d01d42a40a1b8eaf069f1fb593..957fdcd5cdc3775564632bc5a9e0c629d4257ac9 100644 (file)
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -141,7 +141,7 @@ do whatever testing is prudent.
 
 <p>
 You should always run the Mesa test suite before submitting patches.
-The test suite can be run using the 'make check' command. All tests
+The test suite can be run using the 'meson test' command. All tests
 must pass before patches will be accepted, this may mean you have
 to update the tests themselves.
 </p>
@@ -160,10 +160,10 @@ to run your tests on each commit. Assuming your branch is based off
 <code>origin/master</code>, you can run:
 </p>
 <pre>
-$ git rebase --interactive --exec "make check" origin/master
+$ git rebase --interactive --exec "meson test -C build/" origin/master
 </pre>
 <p>
-replacing <code>"make check"</code> with whatever other test you want to
+replacing <code>"meson test"</code> with whatever other test you want to
 run.
 </p>
 
@@ -236,6 +236,11 @@ your email administrator for this.)
     <li>Other tag examples: gallium, util
   </ul>
 </p>
+<p>
+  Tick the following when creating the MR. It allows developers to
+  rebase your work on top of master.
+  <pre>Allow commits from members who can merge to the target branch</pre>
+</p>
 <p>
   If you revise your patches based on code review and push an update
   to your branch, you should maintain a <strong>clean</strong> history
@@ -258,6 +263,8 @@ your email administrator for this.)
       rebased
     <li>Make sure your MR is closed if your patches get pushed outside
       of GitLab
+    <li>Please send MRs from a personal fork rather than from the main
+      Mesa repository, as it clutters it unnecessarily.
   </ul>
 </p>
 
@@ -302,6 +309,17 @@ These Reviewed-by, Acked-by, and Tested-by tags should also be amended
 into commits in a MR before it is merged.
 </p>
 
+<p>
+When providing a Reviewed-by, Acked-by, or Tested-by tag in a gitlab MR,
+enclose the tag in backticks:
+</p>
+<pre>
+  `Reviewed-by: Joe Hacker &lt;jhacker@example.com&gt;`</pre>
+<p>
+This is the markdown format for literal, and will prevent gitlab from hiding
+the &lt; and &gt; symbols.
+</p>
+
 <p>
 Review by non-experts is encouraged.  Understanding how someone else
 goes about solving a problem is a great way to learn your way around
@@ -448,7 +466,7 @@ within the commit summary.
 </pre>
 <li>Test for build breakage between patches e.g last 8 commits.
 <pre>
-    git rebase -i --exec="make -j4" HEAD~8
+    git rebase -i --exec="ninja -C build/" HEAD~8
 </pre>
 <li>Sets the default mailing address for your repo.
 <pre>