Autogenerated HTML docs for v1.2.4-g5a1f

1 files changed, 14 insertions, 11 deletions

diff --git a/git-checkout.html b/git-checkout.html
index f84db99c4..d8ec4847d 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -272,14 +272,17 @@ git-checkout(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

-<p><em>git-checkout</em> [-f] [-b &lt;new_branch&gt;] [-m] [&lt;branch&gt;] [&lt;paths&gt;&#8230;]</p>

+<div class="verseblock">

+<div class="content"><em>git-checkout</em> [-f] [-b &lt;new_branch&gt;] [-m] [&lt;branch&gt;]

+<em>git-checkout</em> [-m] [&lt;branch&gt;] &lt;paths&gt;&#8230;</div></div>

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

-<p>When &lt;paths&gt; are not given, this command switches branches, by

+<p>When &lt;paths&gt; are not given, this command switches branches by

 updating the index and working tree to reflect the specified

 branch, &lt;branch&gt;, and updating HEAD to be &lt;branch&gt; or, if

-specified, &lt;new_branch&gt;.</p>

+specified, &lt;new_branch&gt;.  Using -b will cause &lt;new_branch&gt; to

+be created.</p>

 <p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch

 branches.  It updates the named paths in the working tree from

 the index file (i.e. it runs <tt>git-checkout-index -f -u</tt>).  In

@@ -296,7 +299,7 @@ given paths before updating the working tree.</p>
 </dt>

 <dd>

 <p>

-        Force an re-read of everything.

+        Force a re-read of everything.

 </p>

 </dd>

 <dt>

@@ -312,11 +315,11 @@ given paths before updating the working tree.</p>
 </dt>

 <dd>

 <p>

-        If you have local modifications to a file that is

-        different between the current branch and the branch you

-        are switching to, the command refuses to switch

-        branches, to preserve your modifications in context.

-        With this option, a three-way merge between the current

+        If you have local modifications to one or more files that

+        are different between the current branch and the branch to

+        which you are switching, the command refuses to switch

+        branches in order to preserve your modifications in context.

+        However, with this option, a three-way merge between the current

         branch, your working tree contents, and the new branch

         is done, and you will be on the new branch.

 </p>

@@ -374,7 +377,7 @@ that branch.  You should instead write:</p>
 <li>

 <p>

 After working in a wrong branch, switching to the correct

-branch you would want to is done with:

+branch would be done using:

 </p>

 <div class="listingblock">

 <div class="content">

@@ -438,7 +441,7 @@ $ git update-index frotz</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 10-Mar-2006 00:31:21 UTC

+Last updated 18-Mar-2006 07:45:34 UTC

 </div>

 </div>

 </body>