diff options
Diffstat (limited to 'README/git-tips.html')
| -rw-r--r-- | README/git-tips.html | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/README/git-tips.html b/README/git-tips.html index 55e2d11a7..af1042559 100644 --- a/README/git-tips.html +++ b/README/git-tips.html @@ -690,12 +690,54 @@ are doing.</td> linearize commits. See <a href="linearize_commits.txt">Linearizing Commits</a></td> </tr></table> </div> +<h3 id="linearizecommits">2.3. Linearize Commmits</h3><div style="clear:left"/> +<div class="paragraph"><p>Messy commit histories with lots of needless merge branches just get confusing +when trying to work backwards and work out what happened.</p></div> +<div class="paragraph"><p>To resolve this issue, it is strongly recommended to utilize <tt>git rebase</tt> to +simplify merge histories in a way as such it produces the illusion the merge +never happened, and was never needed, as all the commits simply happend after +all the other commits they were going to be merged into.</p></div> +<div class="paragraph"><p>But the subject of <tt>git rebase</tt> is far too complex to summarise in this one +document, at least for now, so you should use other online sources to learn +this.</p></div> +<h4 id="_advocates_of_git_rebase_theory">2.3.1. Advocates of Git Rebase/Theory</h4> +<div class="dlist"><dl> +<dt class="hdlist1"> +Tate Johnson +</dt> +<dd> +<p> + <a href="http://tatey.com/2009/04/23/git-rebase-for-linear-history/">Git Rebase + For Linear History</a> +</p> +</dd> +<dt class="hdlist1"> +Kent Fredric +</dt> +<dd> +<p> + <a href="http://blog.fox.geek.nz/2010/08/git-rebase-part-1-why-you-should-use-it.html">Git + Rebase Part 1: Why you should use it, Theory.</a> +</p> +</dd> +</dl></div> +<h4 id="_rebase_guides">2.3.2. Rebase Guides</h4> +<div class="dlist"><dl> +<dt class="hdlist1"> +ProGit.org +</dt> +<dd> +<p> + <a href="http://progit.org/book/ch3-6.html"> Rebase </a> +</p> +</dd> +</dl></div> </div> </div> <div id="footnotes"><hr/></div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-29 09:22:59 NZDT +Last updated 2010-09-29 10:11:56 NZDT </div> <div id="footer-badges"> Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a> |