summaryrefslogtreecommitdiffstats
path: root/docs/submittingpatches.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/submittingpatches.html')
-rw-r--r--docs/submittingpatches.html7
1 files changed, 7 insertions, 0 deletions
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