summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
commit92d80370646a0ce43b0c769027492b3c891090aa (patch)
treecee7315334fee3145cb4badcc7a400e3e763fbac /git-branch.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-branch.html b/git-branch.html
index b06372c07..9fc07ddad 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -781,9 +781,9 @@ named commit). With <code>--merged</code>, only branches merged into the named
commit (i.e. the branches whose tip commits are reachable from the named
commit) will be listed. With <code>--no-merged</code> only branches not merged into
the named commit will be listed. If the &lt;commit&gt; argument is missing it
-defaults to <em>HEAD</em> (i.e. the tip of the current branch).</p></div>
+defaults to <code>HEAD</code> (i.e. the tip of the current branch).</p></div>
<div class="paragraph"><p>The command&#8217;s second form creates a new branch head named &lt;branchname&gt;
-which points to the current <em>HEAD</em>, or &lt;start-point&gt; if given.</p></div>
+which points to the current <code>HEAD</code>, or &lt;start-point&gt; if given.</p></div>
<div class="paragraph"><p>Note that this will create the new branch, but it will not switch the
working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the
new branch.</p></div>
@@ -1015,7 +1015,7 @@ way to clean up all obsolete remote-tracking branches.</p></div>
</p>
<div class="paragraph"><p>This behavior is the default when the start point is a remote-tracking branch.
Set the branch.autoSetupMerge configuration variable to <code>false</code> if you
-want <code>git checkout</code> and <code>git branch</code> to always behave as if <em>--no-track</em>
+want <code>git checkout</code> and <code>git branch</code> to always behave as if <code>--no-track</code>
were given. Set it to <code>always</code> if you want this behavior when the
start-point is either a local or remote-tracking branch.</p></div>
</dd>
@@ -1268,7 +1268,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-10-15 16:07:45 PDT
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>