summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Fredric <kentfredric@gmail.com>2010-09-29 10:42:33 +1300
committerKent Fredric <kentfredric@gmail.com>2010-09-29 10:42:33 +1300
commit24c61d43e17961a14ed819030a95e21988d1bf1b (patch)
tree8875e7e713a15833f496e77589fe2ad0a79ac025
parent[doc] Simple simple references to linerizing commits (diff)
downloadperl-overlay-24c61d43e17961a14ed819030a95e21988d1bf1b.tar.gz
perl-overlay-24c61d43e17961a14ed819030a95e21988d1bf1b.tar.bz2
perl-overlay-24c61d43e17961a14ed819030a95e21988d1bf1b.zip
[doc] More rebase article links
-rw-r--r--README/git-tips.html63
-rw-r--r--README/git-tips/linearize-commits.html65
-rw-r--r--README/git-tips/linearize-commits.txt30
3 files changed, 130 insertions, 28 deletions
diff --git a/README/git-tips.html b/README/git-tips.html
index af1042559..09f94071a 100644
--- a/README/git-tips.html
+++ b/README/git-tips.html
@@ -700,7 +700,7 @@ 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>
+<h4 id="_git_rebase_related_articles">2.3.1. Git Rebase related Articles</h4>
<div class="dlist"><dl>
<dt class="hdlist1">
Tate Johnson
@@ -712,23 +712,66 @@ Tate Johnson
</p>
</dd>
<dt class="hdlist1">
-Kent Fredric
+ProGit.org
</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>
+ <a href="http://progit.org/book/ch3-6.html"> Rebase </a>
</p>
</dd>
-</dl></div>
-<h4 id="_rebase_guides">2.3.2. Rebase Guides</h4>
-<div class="dlist"><dl>
<dt class="hdlist1">
-ProGit.org
+John Wiegley
</dt>
<dd>
<p>
- <a href="http://progit.org/book/ch3-6.html"> Rebase </a>
+ <a href="http://www.newartisans.com/2008/04/git-from-the-bottom-up.html">
+ Git from the bottom up</a>
+</p>
+</dd>
+<dt class="hdlist1">
+Tommi Virtanen
+</dt>
+<dd>
+<p>
+ <a href="http://eagain.net/articles/git-for-computer-scientists/">
+ Git for Computer Scientists</a>
+</p>
+</dd>
+<dt class="hdlist1">
+nothingmuch/Yuval Kogman
+</dt>
+<dd>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="http://blog.woobling.org/2009/05/git-rebase-considered-awesome.html">
+ <tt>git rebase</tt> Considered Awesome</a>
+</p>
+</li>
+<li>
+<p>
+<a href="http://blog.woobling.org/2009/08/git-rebase-for-impatient.html">
+ <tt>git rebase</tt> for the Impatient</a>
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
+Dean Strelau
+</dt>
+<dd>
+<p>
+ <a href="http://d.strelau.net/post/47338904/git-pull-rebase-by-default">
+ <tt>git pull --rebase</tt> by default</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>
@@ -737,7 +780,7 @@ ProGit.org
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 10:11:56 NZDT
+Last updated 2010-09-29 10:27:20 NZDT
</div>
<div id="footer-badges">
Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
diff --git a/README/git-tips/linearize-commits.html b/README/git-tips/linearize-commits.html
index d896fc48a..d81a3b877 100644
--- a/README/git-tips/linearize-commits.html
+++ b/README/git-tips/linearize-commits.html
@@ -573,7 +573,7 @@ document, at least for now, so you should use other online sources to learn
this.</p></div>
</div>
</div>
-<h2 id="_advocates_of_git_rebase_theory">1. Advocates of Git Rebase/Theory</h2>
+<h2 id="_git_rebase_related_articles">1. Git Rebase related Articles</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -586,25 +586,66 @@ Tate Johnson
</p>
</dd>
<dt class="hdlist1">
-Kent Fredric
+ProGit.org
</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>
+ <a href="http://progit.org/book/ch3-6.html"> Rebase </a>
</p>
</dd>
-</dl></div>
-</div>
-<h2 id="_rebase_guides">2. Rebase Guides</h2>
-<div class="sectionbody">
-<div class="dlist"><dl>
<dt class="hdlist1">
-ProGit.org
+John Wiegley
</dt>
<dd>
<p>
- <a href="http://progit.org/book/ch3-6.html"> Rebase </a>
+ <a href="http://www.newartisans.com/2008/04/git-from-the-bottom-up.html">
+ Git from the bottom up</a>
+</p>
+</dd>
+<dt class="hdlist1">
+Tommi Virtanen
+</dt>
+<dd>
+<p>
+ <a href="http://eagain.net/articles/git-for-computer-scientists/">
+ Git for Computer Scientists</a>
+</p>
+</dd>
+<dt class="hdlist1">
+nothingmuch/Yuval Kogman
+</dt>
+<dd>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="http://blog.woobling.org/2009/05/git-rebase-considered-awesome.html">
+ <tt>git rebase</tt> Considered Awesome</a>
+</p>
+</li>
+<li>
+<p>
+<a href="http://blog.woobling.org/2009/08/git-rebase-for-impatient.html">
+ <tt>git rebase</tt> for the Impatient</a>
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
+Dean Strelau
+</dt>
+<dd>
+<p>
+ <a href="http://d.strelau.net/post/47338904/git-pull-rebase-by-default">
+ <tt>git pull --rebase</tt> by default</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>
@@ -613,7 +654,7 @@ ProGit.org
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 10:23:14 NZDT
+Last updated 2010-09-29 10:41:39 NZDT
</div>
<div id="footer-badges">
Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
diff --git a/README/git-tips/linearize-commits.txt b/README/git-tips/linearize-commits.txt
index e0eb84be4..772e7680d 100644
--- a/README/git-tips/linearize-commits.txt
+++ b/README/git-tips/linearize-commits.txt
@@ -14,19 +14,37 @@ But the subject of `git rebase` is far too complex to summarise in this one
document, at least for now, so you should use other online sources to learn
this.
-Advocates of Git Rebase/Theory
-------------------------------
+Git Rebase related Articles
+---------------------------
Tate Johnson::
link:http://tatey.com/2009/04/23/git-rebase-for-linear-history/[Git Rebase
For Linear History]
+ProGit.org::
+ link:http://progit.org/book/ch3-6.html[ Rebase ]
+
+John Wiegley::
+ link:http://www.newartisans.com/2008/04/git-from-the-bottom-up.html[
+ Git from the bottom up]
+
+Tommi Virtanen::
+ link:http://eagain.net/articles/git-for-computer-scientists/[
+ Git for Computer Scientists]
+
+nothingmuch/Yuval Kogman::
+ * link:http://blog.woobling.org/2009/05/git-rebase-considered-awesome.html[
+ `git rebase` Considered Awesome]
+
+ * link:http://blog.woobling.org/2009/08/git-rebase-for-impatient.html[
+ `git rebase` for the Impatient]
+
+Dean Strelau::
+ link:http://d.strelau.net/post/47338904/git-pull-rebase-by-default[
+ `git pull --rebase` by default]
+
Kent Fredric::
link: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.]
-Rebase Guides
--------------
-ProGit.org::
- link:http://progit.org/book/ch3-6.html[ Rebase ]