Autogenerated HTML docs for v1.3.3-gd177e

[git.git] / git-rebase.html

diff --git a/git-rebase.html b/git-rebase.html
index 63bd641..974d597 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -273,8 +273,7 @@ git-rebase(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <p><em>git-rebase</em> [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]</p>\r
-<p><em>git-rebase</em> --continue</p>\r
-<p><em>git-rebase</em> --abort</p>\r
+<p><em>git-rebase</em> --continue | --skip | --abort</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -285,9 +284,10 @@ create a new commit for each commit from the original &lt;branch&gt; that does
 not exist in the &lt;upstream&gt; branch.</p>\r
 <p>It is possible that a merge failure will prevent this process from being\r
 completely automatic.  You will have to resolve any such merge failure\r
-and run <tt>git rebase --continue</tt>.  If you can not resolve the merge\r
-failure, running <tt>git rebase --abort</tt> will restore the original &lt;branch&gt;\r
-and remove the working files found in the .dotest directory.</p>\r
+and run <tt>git rebase --continue</tt>.  Another option is to bypass the commit\r
+that caused the merge failure with <tt>git rebase --skip</tt>.  To restore the\r
+original &lt;branch&gt; and remove the .dotest working files, use the command\r
+<tt>git rebase --abort</tt> instead.</p>\r
 <p>Note that if &lt;branch&gt; is not specified on the command line, the currently\r
 checked out branch is used.</p>\r
 <p>Assume the following history exists and the current branch is "topic":</p>\r
@@ -420,7 +420,7 @@ a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-May-2006 07:27:57 UTC\r
+Last updated 17-May-2006 10:34:04 UTC\r
 </div>\r
 </div>\r
 </body>\r