Autogenerated HTML docs for v1.6.5-rc0

1 files changed, 20 insertions, 3 deletions

diff --git a/git-checkout.html b/git-checkout.html
index b7f798233..c46bef3df 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -323,7 +323,8 @@ git-checkout(1) Manual Page
 <div class="verseblock">

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

 <em>git checkout</em> [-q] [-f] [-m] [-b &lt;new_branch&gt;] [&lt;start_point&gt;]

-<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;</div></div>

+<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;

+<em>git checkout</em> --patch [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</div></div>

 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

@@ -335,7 +336,7 @@ branch.</p></div>
 use the --track or --no-track options, which will be passed to <tt>git

 branch</tt>.  As a convenience, --track without <tt>-b</tt> implies branch

 creation; see the description of --track below.</p></div>

-<div class="para"><p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch

+<div class="para"><p>When &lt;paths&gt; or --patch are given, this command does <strong>not</strong> switch

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

 the index file, or from a named &lt;tree-ish&gt; (most often a commit).  In

 this case, the <tt>-b</tt> and <tt>--track</tt> options are meaningless and giving

@@ -477,6 +478,22 @@ the conflicted merge in the specified paths.</p></div>
 </p>

 </dd>

 <dt>

+-p

+</dt>

+<dt>

+--patch

+</dt>

+<dd>

+<p>

+        Interactively select hunks in the difference between the

+        &lt;tree-ish&gt; (or the index, if unspecified) and the working

+        tree.  The chosen hunks are then applied in reverse to the

+        working tree (and if a &lt;tree-ish&gt; was specified, the index).

+</p>

+<div class="para"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard

+edits from your current working tree.</p></div>

+</dd>

+<dt>

 &lt;branch&gt;

 </dt>

 <dd>

@@ -658,7 +675,7 @@ $ git add frotz</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-08-30 00:22:35 UTC

+Last updated 2009-09-08 00:54:59 UTC

 </div>

 </div>

 </body>