Module: Mesa
Branch: master
Commit: 6dae5be806d385a6ef628aa8144885c1a218c051
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6dae5be806d385a6ef628aa8144885c1a218c051
Author: Emil Velikov <emil.veli...@collabora.com>
Date: Mon Nov 28 17:40:04 2016 +0000
docs: add git tips how to do commit fixups and squash them
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
docs/submittingpatches.html | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 5c832ce..74136f2 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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
