diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-27 16:01:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 16:01:14 -0700 |
commit | 6a3d665f4a653957918d7c61d6e7a1e464fc8054 (patch) | |
tree | 2683481bae44ef7cdd6c2bfa64d03f01689b8872 /git-checkout.html | |
parent | e48956dde737f7b49a056b3142992a70244566a9 (diff) | |
download | git-htmldocs-6a3d665f4a653957918d7c61d6e7a1e464fc8054.tar.gz |
Autogenerated HTML docs for v2.29.1-59-gf9b64
Diffstat (limited to 'git-checkout.html')
-rw-r--r-- | git-checkout.html | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-checkout.html b/git-checkout.html index adbd858cd..4afa59e7e 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -1012,7 +1012,9 @@ e.g. <code>checkout.defaultRemote=origin</code> to always checkout remote branches from there if <code><branch></code> is ambiguous but exists on the
<em>origin</em> remote. See also <code>checkout.defaultRemote</code> in
<a href="git-config.html">git-config(1)</a>.</p></div>
-<div class="paragraph"><p>Use <code>--no-guess</code> to disable this.</p></div>
+<div class="paragraph"><p><code>--guess</code> is the default behavior. Use <code>--no-guess</code> to disable it.</p></div>
+<div class="paragraph"><p>The default behavior can be set via the <code>checkout.guess</code> configuration
+variable.</p></div>
</dd>
<dt class="hdlist1">
-l
@@ -1257,6 +1259,9 @@ leave out at most one of <code>A</code> and <code>B</code>, in which case it def Tree to checkout from (when paths are given). If not specified,
the index will be used.
</p>
+<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>
<dt class="hdlist1">
--
@@ -1555,7 +1560,7 @@ $ git add frotz</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-09-18 18:12:31 PDT
+ 2020-10-27 15:58:27 PDT
</div>
</div>
</body>
|