aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-10-27 15:09:51 -0700
committerJunio C Hamano <gitster@pobox.com>2020-10-27 15:09:51 -0700
commit0e41cfad622dde07815d3d575fd3bf05db83da32 (patch)
tree16affb2e58940325541f73855d01387e42fd4bde /Documentation/git-checkout.txt
parentf3cfeb3078ce4af0ac764515795f7e0849a88931 (diff)
parent64f1f58fe7c0837bd0ae56ba83add5e1b84c54d3 (diff)
downloadgit-0e41cfad622dde07815d3d575fd3bf05db83da32.tar.gz
Merge branch 'dl/checkout-guess'
"git checkout" learned to use checkout.guess configuration variable and enable/disable its "--[no-]guess" option accordingly. * dl/checkout-guess: checkout: learn to respect checkout.guess Documentation/config/checkout: replace sq with backticks
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 6ae8bf8dee..b1a6fe4499 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/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