summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-10-27 16:01:14 -0700
committerJunio C Hamano <gitster@pobox.com>2020-10-27 16:01:14 -0700
commit6a3d665f4a653957918d7c61d6e7a1e464fc8054 (patch)
tree2683481bae44ef7cdd6c2bfa64d03f01689b8872 /git-checkout.txt
parente48956dde737f7b49a056b3142992a70244566a9 (diff)
downloadgit-htmldocs-6a3d665f4a653957918d7c61d6e7a1e464fc8054.tar.gz
Autogenerated HTML docs for v2.29.1-59-gf9b64
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index afa5c11fd..b1a6fe449 100644
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -192,7 +192,10 @@ branches from there if `<branch>` is ambiguous but exists on the
'origin' remote. See also `checkout.defaultRemote` in
linkgit:git-config[1].
+
-Use `--no-guess` to disable this.
+`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
-l::
Create the new branch's reflog; see linkgit:git-branch[1] for
@@ -351,6 +354,10 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
<tree-ish>::
Tree to checkout from (when paths are given). If not specified,
the index will be used.
++
+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`.
\--::
Do not interpret any more arguments as options.