summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-branch.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/git-branch.html b/git-branch.html
index 59bb85d54..2c1f8878e 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -273,12 +273,12 @@ git-branch(1) Manual Page
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged]
+<div class="content"><em>git branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged]
[-v [--abbrev=&lt;length&gt; | --no-abbrev]]
[--contains &lt;commit&gt;]
-<em>git-branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
-<em>git-branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
-<em>git-branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>
+<em>git branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
+<em>git branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
+<em>git branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -299,7 +299,7 @@ equal to that of the currently checked out branch.</p>
working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the
new branch.</p>
<p>When a local branch is started off a remote branch, git sets up the
-branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from
+branch so that <tt>git-pull</tt> will appropriately merge from
the remote branch. This behavior may be changed via the global
<tt>branch.autosetupmerge</tt> configuration flag. That setting can be
overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p>
@@ -313,7 +313,7 @@ specify more than one branch for deletion. If the branch currently
has a reflog then the reflog will also be deleted.</p>
<p>Use -r together with -d to delete remote-tracking branches. Note, that it
only makes sense to delete remote-tracking branches if they no longer exist
-in remote repository or if <a href="git-fetch.html">git-fetch(1)</a> was configured not to fetch
+in remote repository or if <tt>git-fetch</tt> was configured not to fetch
them again. See also <em>prune</em> subcommand of <a href="git-remote.html">git-remote(1)</a> for way to
clean up all obsolete remote-tracking branches.</p>
</div>
@@ -437,14 +437,14 @@ clean up all obsolete remote-tracking branches.</p>
</dt>
<dd>
<p>
- When creating a new branch, set up configuration so that git-pull
+ When creating a new branch, set up configuration so that <tt>git-pull</tt>
will automatically retrieve data from the start point, which must be
a branch. Use this if you always pull from the same upstream branch
into the new branch, and if you don't want to use "git pull
&lt;repository&gt; &lt;refspec&gt;" explicitly. This behavior is the default
when the start point is a remote branch. Set the
branch.autosetupmerge configuration variable to <tt>false</tt> if you want
- git-checkout and git-branch to always behave as if <em>--no-track</em> were
+ <tt>git-checkout</tt> and <tt>git-branch</tt> to always behave as if <em>--no-track</em> were
given. Set it to <tt>always</tt> if you want this behavior when the
start-point is either a local or remote branch.
</p>
@@ -616,7 +616,7 @@ but different purposes:</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:20 UTC
+Last updated 02-Jul-2008 03:01:33 UTC
</div>
</div>
</body>