Autogenerated HTML docs for v1.5.6.1-156-ge903b

1 files changed, 20 insertions, 20 deletions

diff --git a/git-rebase.html b/git-rebase.html
index c12560270..564948b37 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -273,15 +273,15 @@ git-rebase(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge]

+<div class="content"><em>git rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge]

         [-s &lt;strategy&gt; | --strategy=&lt;strategy&gt;]

         [-C&lt;n&gt;] [ --whitespace=&lt;option&gt;] [-p | --preserve-merges]

         [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]

-<em>git-rebase</em> --continue | --skip | --abort</div></div>

+<em>git rebase</em> --continue | --skip | --abort</div></div>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

-<p>If &lt;branch&gt; is specified, git-rebase will perform an automatic

+<p>If &lt;branch&gt; is specified, <tt>git-rebase</tt> will perform an automatic

 <tt>git checkout &lt;branch&gt;</tt> before doing anything else.  Otherwise

 it remains on the current branch.</p>

 <p>All changes made by commits in the current branch but that are not

@@ -311,8 +311,8 @@ original &lt;branch&gt; and remove the .dotest working files, use the command
 <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>

+<pre><tt>git rebase master

+git rebase master topic</tt></pre>

 </div></div>

 <p>would be:</p>

 <div class="listingblock">

@@ -325,7 +325,7 @@ git-rebase master topic</tt></pre>
 followed by <tt>git rebase master</tt>.</p>

 <p>If the upstream branch already contains a change you have made (e.g.,

 because you mailed a patch which was applied upstream), then that commit

-will be skipped. For example, running <tt>git-rebase master</tt> on the

+will be skipped. For example, running <tt>git rebase master</tt> on the

 following history (in which A' and A introduce the same set of changes,

 but have different committer information):</p>

 <div class="listingblock">

@@ -369,7 +369,7 @@ got merged into more stable <em>master</em> branch, like this:</p>
 <p>We can get this using the following command:</p>

 <div class="literalblock">

 <div class="content">

-<pre><tt>git-rebase --onto master next topic</tt></pre>

+<pre><tt>git rebase --onto master next topic</tt></pre>

 </div></div>

 <p>Another example of --onto option is to rebase part of a

 branch.  If we have the following situation:</p>

@@ -384,7 +384,7 @@ branch.  If we have the following situation:</p>
 <p>then the command</p>

 <div class="literalblock">

 <div class="content">

-<pre><tt>git-rebase --onto master topicA topicB</tt></pre>

+<pre><tt>git rebase --onto master topicA topicB</tt></pre>

 </div></div>

 <p>would result in:</p>

 <div class="listingblock">

@@ -405,7 +405,7 @@ the following situation:</p>
 <p>then the command</p>

 <div class="literalblock">

 <div class="content">

-<pre><tt>git-rebase --onto topicA~5 topicA~3 topicA</tt></pre>

+<pre><tt>git rebase --onto topicA~5 topicA~3 topicA</tt></pre>

 </div></div>

 <p>would result in the removal of commits F and G:</p>

 <div class="listingblock">

@@ -415,8 +415,8 @@ the following situation:</p>
 <p>This is useful if F and G were flawed in some way, or should not be

 part of topicA.  Note that the argument to --onto and the &lt;upstream&gt;

 parameter can be any valid commit-ish.</p>

-<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

+<p>In case of conflict, <tt>git-rebase</tt> will stop at the first problematic commit

+and leave conflict markers in the tree.  You can use <tt>git-diff</tt> 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>

@@ -430,7 +430,7 @@ desired resolution, you can continue the rebasing process with</p>
 <div class="content">

 <pre><tt>git rebase --continue</tt></pre>

 </div></div>

-<p>Alternatively, you can undo the git-rebase with</p>

+<p>Alternatively, you can undo the <tt>git-rebase</tt> with</p>

 <div class="literalblock">

 <div class="content">

 <pre><tt>git rebase --abort</tt></pre>

@@ -791,13 +791,13 @@ sure that the current HEAD is "B", and call</p>
 <h2>SPLITTING COMMITS</h2>

 <div class="sectionbody">

 <p>In interactive mode, you can mark commits with the action "edit".  However,

-this does not necessarily mean that <em>git rebase</em> expects the result of this

+this does not necessarily mean that <tt>git-rebase</tt> expects the result of this

 edit to be exactly one commit.  Indeed, you can undo the commit, or you can

 add other commits.  This can be used to split a commit into two:</p>

 <ul>

 <li>

 <p>

-Start an interactive rebase with <em>git rebase -i &lt;commit&gt;^</em>, where

+Start an interactive rebase with <tt>git rebase -i &lt;commit&gt;^</tt>, where

   &lt;commit&gt; is the commit you want to split.  In fact, any commit range

   will do, as long as it contains that commit.

 </p>

@@ -809,7 +809,7 @@ Mark the commit you want to split with the action "edit".
 </li>

 <li>

 <p>

-When it comes to editing that commit, execute <em>git reset HEAD^</em>.  The

+When it comes to editing that commit, execute <tt>git reset HEAD^</tt>.  The

   effect is that the HEAD is rewound by one, and the index follows suit.

   However, the working tree stays the same.

 </p>

@@ -817,8 +817,8 @@ When it comes to editing that commit, execute <em>git reset HEAD^</em>.  The
 <li>

 <p>

 Now add the changes to the index that you want to have in the first

-  commit.  You can use <a href="git-add.html">git-add(1)</a> (possibly interactively) and/or

-  <a href="git-gui.html">git-gui(1)</a> to do that.

+  commit.  You can use <tt>git add</tt> (possibly interactively) or

+  <tt>git-gui</tt> (or both) to do that.

 </p>

 </li>

 <li>

@@ -834,13 +834,13 @@ Repeat the last two steps until your working tree is clean.
 </li>

 <li>

 <p>

-Continue the rebase with <em>git rebase --continue</em>.

+Continue the rebase with <tt>git rebase --continue</tt>.

 </p>

 </li>

 </ul>

 <p>If you are not absolutely sure that the intermediate revisions are

 consistent (they compile, pass the testsuite, etc.) you should use

-<a href="git-stash.html">git-stash(1)</a> to stash away the not-yet-committed changes

+<tt>git-stash</tt> to stash away the not-yet-committed changes

 after each commit, test, and amend the commit if fixes are necessary.</p>

 </div>

 <h2>Authors</h2>

@@ -858,7 +858,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 08-Jun-2008 22:46:57 UTC

+Last updated 02-Jul-2008 03:01:57 UTC

 </div>

 </div>

 </body>