diff options
| author | Emil Velikov <[email protected]> | 2016-11-28 17:40:04 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-11-28 17:49:04 +0000 |
| commit | 6dae5be806d385a6ef628aa8144885c1a218c051 (patch) | |
| tree | 742d66cd961e0762b13c907f60bfa4cd7e6d804b | |
| parent | ba28f2136febca32fe567510e88265b99fcb83d2 (diff) | |
docs: add git tips how to do commit fixups and squash them
Signed-off-by: Emil Velikov <[email protected]>
| -rw-r--r-- | docs/submittingpatches.html | 7 |
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 |