From: Emil Velikov <emil.velikov@collabora.com>
Date: Mon, 28 Nov 2016 17:40:04 +0000 (+0000)
Subject: docs: add git tips how to do commit fixups and squash them
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6dae5be806d385a6ef628aa8144885c1a218c051;p=mesa.git

docs: add git tips how to do commit fixups and squash them

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 5c832ce4b33..74136f2fce3 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -337,6 +337,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