summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-17 21:34:41 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-17 21:34:41 -0700
commitf2d4a1364f539d2aa54a164fa892442161c0ead0 (patch)
tree50eb7ac282135ee639ac2d509a20ed2528174b45 /git-checkout.html
parente3cfafcbbf40fd0323a82ca7cf5868a7abae7279 (diff)
downloadgit-htmldocs-f2d4a1364f539d2aa54a164fa892442161c0ead0.tar.gz
Autogenerated HTML docs for v1.8.4.1-544-g2141c
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html15
1 files changed, 8 insertions, 7 deletions
diff --git a/git-checkout.html b/git-checkout.html
index 81fcb9d42..ea65102c1 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -747,7 +747,8 @@ git-checkout(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git checkout</em> [-q] [-f] [-m] [&lt;branch&gt;]
-<em>git checkout</em> [-q] [-f] [-m] [--detach] [&lt;commit&gt;]
+<em>git checkout</em> [-q] [-f] [-m] --detach [&lt;branch&gt;]
+<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> [-p|--patch] [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</pre>
@@ -812,7 +813,7 @@ successful.</p></div>
<em>git checkout</em> --detach [&lt;branch&gt;]
</dt>
<dt class="hdlist1">
-<em>git checkout</em> &lt;commit&gt;
+<em>git checkout</em> [--detach] &lt;commit&gt;
</dt>
<dd>
<p>
@@ -823,10 +824,10 @@ successful.</p></div>
tree will be the state recorded in the commit plus the local
modifications.
</p>
-<div class="paragraph"><p>Passing <code>--detach</code> forces this behavior in the case of a &lt;branch&gt; (without
-the option, giving a branch name to the command would check out the branch,
-instead of detaching HEAD at it), or the current commit,
-if no &lt;branch&gt; is specified.</p></div>
+<div class="paragraph"><p>When the &lt;commit&gt; argument is a branch name, the <code>--detach</code> option can
+be used to detach HEAD at the tip of the branch (<code>git checkout
+&lt;branch&gt;</code> would check out that branch without detaching HEAD).</p></div>
+<div class="paragraph"><p>Omitting &lt;branch&gt; detaches HEAD at the tip of the current branch.</p></div>
</dd>
<dt class="hdlist1">
<em>git checkout</em> [-p|--patch] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;
@@ -1360,7 +1361,7 @@ $ git add frotz</code></pre>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-10-17 21:34:27 PDT
</div>
</div>
</body>