X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rebase.html;h=974d5973884796b25581234a4cc0e2743e95965b;hb=59929ee0dab1fc41579cb4a961e61cb1b28cc098;hp=bf6487331c630265cb14b68d83f011fff5ab6c7d;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-rebase.html b/git-rebase.html
index bf648733..974d5973 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -266,22 +266,99 @@ git-rebase(1) Manual Page
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-rebase -
-   Rebase local commits to new upstream head.
+   Rebase local commits to a new head
 </p>
 </div>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-rebase</em> &lt;upstream&gt; [&lt;head&gt;]</p>
+<p><em>git-rebase</em> [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]</p>
+<p><em>git-rebase</em> --continue | --skip | --abort</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
-<p>Rebases local commits to the new head of the upstream tree.</p>
+<p>git-rebase replaces &lt;branch&gt; with a new branch of the same name.  When
+the --onto option is provided the new branch starts out with a HEAD equal
+to &lt;newbase&gt;, otherwise it is equal to &lt;upstream&gt;.  It then attempts to
+create a new commit for each commit from the original &lt;branch&gt; that does
+not exist in the &lt;upstream&gt; branch.</p>
+<p>It is possible that a merge failure will prevent this process from being
+completely automatic.  You will have to resolve any such merge failure
+and run <tt>git rebase --continue</tt>.  Another option is to bypass the commit
+that caused the merge failure with <tt>git rebase --skip</tt>.  To restore the
+original &lt;branch&gt; and remove the .dotest working files, use the command
+<tt>git rebase --abort</tt> instead.</p>
+<p>Note that if &lt;branch&gt; is not specified on the command line, the currently
+checked out branch is used.</p>
+<p>Assume the following history exists and the current branch is "topic":</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>          A---B---C topic
+         /
+    D---E---F---G master</tt></pre>
+</div></div>
+<p>From this point, the result of either of the following commands:</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git-rebase master
+git-rebase master topic</tt></pre>
+</div></div>
+<p>would be:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>                  A'--B'--C' topic
+                 /
+    D---E---F---G master</tt></pre>
+</div></div>
+<p>While, starting from the same point, the result of either of the following
+commands:</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git-rebase --onto master~1 master
+git-rebase --onto master~1 master topic</tt></pre>
+</div></div>
+<p>would be:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>              A'--B'--C' topic
+             /
+    D---E---F---G master</tt></pre>
+</div></div>
+<p>In case of conflict, git-rebase will stop at the first problematic commit
+and leave conflict markers in the tree.  You can use git diff to locate
+the markers (&lt;&lt;&lt;&lt;&lt;&lt;) and make edits to resolve the conflict.  For each
+file you edit, you need to tell git that the conflict has been resolved,
+typically this would be done with</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git update-index &lt;filename&gt;</tt></pre>
+</div></div>
+<p>After resolving the conflict manually and updating the index with the
+desired resolution, you can continue the rebasing process with</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git rebase --continue</tt></pre>
+</div></div>
+<p>Alternatively, you can undo the git-rebase with</p>
+<div class="literalblock">
+<div class="content">
+<pre><tt>git rebase --abort</tt></pre>
+</div></div>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
 <dl>
 <dt>
+&lt;newbase&gt;
+</dt>
+<dd>
+<p>
+        Starting point at which to create the new commits. If the
+        --onto option is not specified, the starting point is
+        &lt;upstream&gt;.
+</p>
+</dd>
+<dt>
 &lt;upstream&gt;
 </dt>
 <dd>
@@ -290,15 +367,45 @@ git-rebase(1) Manual Page
 </p>
 </dd>
 <dt>
-&lt;head&gt;
+&lt;branch&gt;
 </dt>
 <dd>
 <p>
         Working branch; defaults to HEAD.
 </p>
 </dd>
+<dt>
+--continue
+</dt>
+<dd>
+<p>
+        Restart the rebasing process after having resolved a merge conflict.
+</p>
+</dd>
+<dt>
+--abort
+</dt>
+<dd>
+<p>
+        Restore the original branch and abort the rebase operation.
+</p>
+</dd>
 </dl>
 </div>
+<h2>NOTES</h2>
+<div class="sectionbody">
+<p>When you rebase a branch, you are changing its history in a way that
+will cause problems for anyone who already has a copy of the branch
+in their repository and tries to pull updates from you.  You should
+understand the implications of using <em>git rebase</em> on a repository that
+you share.</p>
+<p>When the git rebase command is run, it will first execute a "pre-rebase"
+hook if one exists.  You can use this hook to do sanity checks and
+reject the rebase if it isn't appropriate.  Please see the template
+pre-rebase hook script for an example.</p>
+<p>You must be in the top directory of your project to start (or continue)
+a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
+</div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p>
@@ -313,7 +420,7 @@ git-rebase(1) Manual Page
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:16:32 PDT
+Last updated 17-May-2006 10:34:04 UTC
 </div>
 </div>
 </body>
