summaryrefslogtreecommitdiffstats
path: root/git-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-03-03 05:13:12 +0000
committerJunio C Hamano <junio@kernel.org>2010-03-03 05:13:12 +0000
commit4aa0bccc4a84ed806fa27aefcb79e56e508dc6c9 (patch)
treecda77a5862862e75ef52e0658674a70c4143bd80 /git-branch.html
parentbf43344465f332611b6ae190bc6ac4eedb9cfba3 (diff)
downloadgit-htmldocs-4aa0bccc4a84ed806fa27aefcb79e56e508dc6c9.tar.gz
Autogenerated HTML docs for v1.7.0.1-138-ga75b
Diffstat (limited to 'git-branch.html')
-rw-r--r--git-branch.html8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-branch.html b/git-branch.html
index 23605a1fe..f4bcccfc4 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -321,7 +321,7 @@ 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]
+<div class="content"><em>git branch</em> [--color[=&lt;when&gt;] | --no-color] [-r | -a]
[-v [--abbrev=&lt;length&gt; | --no-abbrev]]
[(--merged | --no-merged | --contains) [&lt;commit&gt;]]
<em>git branch</em> [--set-upstream | --track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
@@ -422,11 +422,12 @@ way to clean up all obsolete remote-tracking branches.</p></div>
</p>
</dd>
<dt>
---color
+--color[=&lt;when&gt;]
</dt>
<dd>
<p>
Color branches to highlight current, local, and remote branches.
+ The value must be always (the default), never, or auto.
</p>
</dd>
<dt>
@@ -436,6 +437,7 @@ way to clean up all obsolete remote-tracking branches.</p></div>
<p>
Turn off branch colors, even when the configuration file gives the
default to color output.
+ Same as <tt>--color=never</tt>.
</p>
</dd>
<dt>
@@ -694,7 +696,7 @@ a branch?&#8221;</a> in the Git User's Manual.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-02-13 00:59:35 UTC
+Last updated 2010-03-03 05:12:39 UTC
</div>
</div>
</body>