summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
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.txt
parent912712bb106faf8773bffb94876a77a2986f0be0 (diff)
downloadgit-htmldocs-371470a74a288fec266da71f914ff3ada119085f.tar.gz
Autogenerated HTML docs for v2.15.1-388-gd9a37
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index bfa64ca5c..ca5fc9c79 100644
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -274,11 +274,11 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
+
-As a special case, the `"@{-N}"` syntax for the N-th last branch/commit
-checks out branches (instead of detaching). You may also specify
-`-` which is synonymous with `"@{-1}"`.
+You can use the `"@{-N}"` syntax to refer to the N-th last
+branch/commit checked out using "git checkout" operation. You may
+also specify `-` which is synonymous to `"@{-1}`.
+
-As a further special case, you may use `"A...B"` as a shortcut for the
+As a special case, you may use `"A...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.