summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-05-11 20:09:24 +0000
committerJunio C Hamano <junio@kernel.org>2011-05-11 20:09:24 +0000
commit9eb5835b38fac6607b8de10e1caf540866d94632 (patch)
tree68c27c30d12648c1366a0a1cfcdc7a64692c49de /git-checkout.html
parent5f2627d81e2612a0dddd84a6160151a6780cb4a6 (diff)
downloadgit-htmldocs-9eb5835b38fac6607b8de10e1caf540866d94632.tar.gz
Autogenerated HTML docs for v1.7.5.1-249-gdbe9c
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/git-checkout.html b/git-checkout.html
index 96201509a..1cb491059 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -419,7 +419,7 @@ git-checkout(1) Manual Page
<em>git checkout</em> [-q] [-f] [-m] [--detach] [&lt;commit&gt;]
<em>git checkout</em> [-q] [-f] [-m] [[-b|-B|--orphan] &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;
-<em>git checkout</em> --patch [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</div>
+<em>git checkout</em> [-p|--patch] [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -460,7 +460,7 @@ $ git checkout &lt;branch&gt;</tt></pre>
successful.</p></div>
</dd>
<dt class="hdlist1">
-<em>git checkout</em> [--patch] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;
+<em>git checkout</em> [-p|--patch] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;
</dt>
<dd>
<p>
@@ -672,7 +672,8 @@ the conflicted merge in the specified paths.</p></div>
working tree (and if a &lt;tree-ish&gt; was specified, the index).
</p>
<div class="paragraph"><p>This means that you can use <tt>git checkout -p</tt> to selectively discard
-edits from your current working tree.</p></div>
+edits from your current working tree. See the &#8220;Interactive Mode&#8221;
+section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <tt>--patch</tt> mode.</p></div>
</dd>
<dt class="hdlist1">
&lt;branch&gt;
@@ -958,7 +959,7 @@ $ git add frotz</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-05-11 20:08:54 UTC
</div>
</div>
</body>