summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 16:44:27 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-26 16:44:27 -0700
commitad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb (patch)
tree95495194621897b14bcc1d50852cc2fa8bbbf2f6 /git-checkout.html
parent5380048278a5f5aa14549fffee029a8273a8bd0d (diff)
downloadgit-htmldocs-ad70bf0a8bcaab0a6f1c36a42110b52dc2b00beb.tar.gz
Autogenerated HTML docs for v2.10.0-440-g21f86
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html15
1 files changed, 14 insertions, 1 deletions
diff --git a/git-checkout.html b/git-checkout.html
index 25dbbfa71..512e4160f 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -1287,6 +1287,19 @@ $ git log -g -2 HEAD</code></pre>
</div>
</div>
<div class="sect1">
+<h2 id="_argument_disambiguation">ARGUMENT DISAMBIGUATION</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>When there is only one argument given and it is not <code>--</code> (e.g. "git
+checkout abc"), and when the argument is both a valid <code>&lt;tree-ish&gt;</code>
+(e.g. a branch "abc" exists) and a valid <code>&lt;pathspec&gt;</code> (e.g. a file
+or a directory whose name is "abc" exists), Git would usually ask
+you to disambiguate. Because checking out a branch is so common an
+operation, however, "git checkout abc" takes "abc" as a <code>&lt;tree-ish&gt;</code>
+in such a situation. Use <code>git checkout -- &lt;pathspec&gt;</code> if you want
+to checkout these paths out of the index.</p></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
<div class="olist arabic"><ol class="arabic">
@@ -1401,7 +1414,7 @@ $ git add frotz</code></pre>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-13 14:58:50 PDT
+Last updated 2016-09-26 16:43:51 PDT
</div>
</div>
</body>