summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-13 14:26:40 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-13 14:26:40 -0800
commit371470a74a288fec266da71f914ff3ada119085f (patch)
tree10f6f6ea05630845788eb0307d2d2b8095f958a9 /git-checkout.html
parent912712bb106faf8773bffb94876a77a2986f0be0 (diff)
downloadgit-htmldocs-371470a74a288fec266da71f914ff3ada119085f.tar.gz
Autogenerated HTML docs for v2.15.1-388-gd9a37
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-checkout.html b/git-checkout.html
index 18769219b..5f5354a1a 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -1130,10 +1130,10 @@ section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <co
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
</p>
-<div class="paragraph"><p>As a special case, the <code>"@{-N}"</code> syntax for the N-th last branch/commit
-checks out branches (instead of detaching). You may also specify
-<code>-</code> which is synonymous with <code>"@{-1}"</code>.</p></div>
-<div class="paragraph"><p>As a further special case, you may use <code>"A...B"</code> as a shortcut for the
+<div class="paragraph"><p>You can use the <code>"@{-N}"</code> syntax to refer to the N-th last
+branch/commit checked out using "git checkout" operation. You may
+also specify <code>-</code> which is synonymous to <code>"@{-1}</code>.</p></div>
+<div class="paragraph"><p>As a special case, you may use <code>"A...B"</code> as a shortcut for the
merge base of <code>A</code> and <code>B</code> if there is exactly one merge base. You can
leave out at most one of <code>A</code> and <code>B</code>, in which case it defaults to <code>HEAD</code>.</p></div>
</dd>
@@ -1435,7 +1435,7 @@ $ git add frotz</code></pre>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-12-06 10:03:34 PST
+Last updated 2017-12-13 14:26:19 PST
</div>
</div>
</body>