summaryrefslogtreecommitdiffstats
path: root/git-checkout.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-06-02 23:32:31 +0000
committerJunio C Hamano <junio@kernel.org>2010-06-02 23:32:31 +0000
commite32ec8b89b623de73d1ccacb430b1c4ab16e4fcb (patch)
tree27285614d896d302efe7f7740b87009fd0ae0c33 /git-checkout.html
parentb671fb5c100813248be882136374ea6c6038d4e8 (diff)
downloadgit-htmldocs-e32ec8b89b623de73d1ccacb430b1c4ab16e4fcb.tar.gz
Autogenerated HTML docs for v1.7.1-244-gbdc4
Diffstat (limited to 'git-checkout.html')
-rw-r--r--git-checkout.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-checkout.html b/git-checkout.html
index e8b983abe..c32d65f9a 100644
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -528,6 +528,9 @@ edits from your current working tree.</p></div>
<div class="para"><p>As a special case, the <tt>"@{-N}"</tt> syntax for the N-th last branch
checks out the branch (instead of detaching). You may also specify
<tt>-</tt> which is synonymous with <tt>"@{-1}"</tt>.</p></div>
+<div class="para"><p>As a further special case, you may use <tt>"A&#8230;B"</tt> as a shortcut for the
+merge base of <tt>A</tt> and <tt>B</tt> if there is exactly one merge base. You can
+leave out at most one of <tt>A</tt> and <tt>B</tt>, in which case it defaults to <tt>HEAD</tt>.</p></div>
</dd>
<dt>
&lt;new_branch&gt;
@@ -696,7 +699,7 @@ $ git add frotz</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-05-21 14:57:15 UTC
+Last updated 2010-06-02 23:32:07 UTC
</div>
</div>
</body>