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 5c832ce4b33104491d735e046d2311bec1eb437b..74136f2fce3ae992ef6a8aa69d65df56250d4a5b 100644 (file)
--- 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