summaryrefslogtreecommitdiffstats
path: root/git-rebase.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-31 11:19:09 -0700
committerJunio C Hamano <gitster@pobox.com>2012-03-31 11:19:09 -0700
commit0ff9816f16e3ca9d26616328e79bb9a12e8f3a1e (patch)
treef7d24c2fb5655f4b562c9bc1f38c2a671389b7fd /git-rebase.html
parent892d90ec9b6d7c228e63b6eead67b76a5730f621 (diff)
downloadgit-htmldocs-0ff9816f16e3ca9d26616328e79bb9a12e8f3a1e.tar.gz
Autogenerated HTML docs for v1.7.10-rc3-3-g19a6c
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html16
1 files changed, 3 insertions, 13 deletions
diff --git a/git-rebase.html b/git-rebase.html
index c0139ed78..013c4d41b 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1316,11 +1316,7 @@ submit
</li>
</ol></div>
<div class="paragraph"><p>where point 2. consists of several instances of</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-regular use
-</p>
+<div class="paragraph"><p>a) regular use</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -1333,11 +1329,7 @@ commit
</p>
</li>
</ol></div>
-</li>
-<li>
-<p>
-independent fixup
-</p>
+<div class="paragraph"><p>b) independent fixup</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -1355,8 +1347,6 @@ commit it
</p>
</li>
</ol></div>
-</li>
-</ol></div>
<div class="paragraph"><p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite
perfect commit it fixes, because that commit is buried deeply in a
patch series. That is exactly what interactive rebase is for: use it
@@ -1658,7 +1648,7 @@ reorder commits tend to produce counterintuitive results.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>