X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Fsubmittingpatches.html;h=141cec27581cb77fcd0ae299f777a0f167b6e795;hb=0ef1b4d5b1a3af4ce7ae42ef4259d5db320724c5;hp=3d07c5e96d41948a8819cbc55c971be4eb46aa79;hpb=28158c3e543d364c9d6bb0cced1b251915076214;p=mesa.git

diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 3d07c5e96d4..141cec27581 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -104,6 +104,9 @@ that should be documented with:
     Reviewed-by: Joe Hacker <jhacker@foo.com>
     Acked-by: Joe Hacker <jhacker@foo.com>
 </pre>
+<li>If sending later revision of a patch, add all the tags - ack, r-b,
+Cc: mesa-stable and/or other. This provides reviewers with quick feedback if the
+patch has already been reviewed.
 <li>In order for your patch to reach the prospective reviewer easier/faster,
 use the script scripts/get_reviewer.pl to get a list of individuals and include
 them in the CC list.
@@ -246,6 +249,13 @@ copied to the mesa-stable@ mailing list when you use "git send-email" to send
 patches to the mesa-dev@ mailing list. If you prefer using --suppress-cc that
 won't have any effect negative effect on the patch nomination.
 
+<p>
+Note: by removing the tag [as the commit is pushed] the patch is
+<strong>explicitly</strong> rejected from inclusion in the stable branch(es).
+<br>
+Thus, drop the line <strong>only</strong> if you want to cancel the nomination.
+</p>
+
 <h2 id="criteria">Criteria for accepting patches to the stable branch</h2>
 
 Mesa has a designated release manager for each stable branch, and the release
@@ -334,6 +344,13 @@ be rejected:
 <h2 id="gittips">Git tips</h2>
 
 <ul>
+<li><code>git rebase -i ...</code> is your friend. Don't be afraid to use it.
+<li>Apply a fixup to commit FOO.
+<pre>
+    git add ...
+    git commit --fixup=FOO
+    git rebase -i --autosquash ...
+</pre>
 <li>Test for build breakage between patches e.g last 8 commits.
 <pre>
     git rebase -i --exec="make -j4" HEAD~8