summaryrefslogtreecommitdiffstats
path: root/git-status.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-06-19 00:33:17 +0000
committerJunio C Hamano <junio@kernel.org>2010-06-19 00:33:17 +0000
commitf5de4cf4e1e8bccd17515d71186e752f4716cac9 (patch)
treeab2db92276d37478b5b109d568c3726bac9f405c /git-status.html
parent4b7af1106d18fbf957f1f7257d099d47d2fa775f (diff)
downloadgit-htmldocs-f5de4cf4e1e8bccd17515d71186e752f4716cac9.tar.gz
Autogenerated HTML docs for v1.7.1-422-g049e9
Diffstat (limited to 'git-status.html')
-rw-r--r--git-status.html17
1 files changed, 15 insertions, 2 deletions
diff --git a/git-status.html b/git-status.html
index e7231c07c..a739bcff5 100644
--- a/git-status.html
+++ b/git-status.html
@@ -347,6 +347,17 @@ third are what you _could_ commit by running <em>git add</em> before running
</p>
</dd>
<dt>
+-b
+</dt>
+<dt>
+--branch
+</dt>
+<dd>
+<p>
+ Show the branch and tracking info even in short-format.
+</p>
+</dd>
+<dt>
--porcelain
</dt>
<dd>
@@ -492,6 +503,8 @@ U U unmerged, both modified
? ? untracked
-------------------------------------------------</tt></pre>
</div></div>
+<div class="para"><p>If -b is used the short-format status is preceded by a line</p></div>
+<div class="para"><p>## branchname tracking info</p></div>
<div class="para"><p>There is an alternate -z format recommended for machine parsing. In
that format, the status field is the same, but some other things
change. First, the <em>-&gt;</em> is omitted from rename entries and the field
@@ -500,7 +513,7 @@ order is reversed (e.g <em>from -&gt; to</em> becomes <em>to from</em>). Second,
and the terminating newline (but a space still separates the status
field from the first filename). Third, filenames containing special
characters are not specially formatted; no quoting or
-backslash-escaping is performed.</p></div>
+backslash-escaping is performed. Fourth, there is no branch line.</p></div>
</div>
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
@@ -534,7 +547,7 @@ shown (see --summary-limit option of <a href="git-submodule.html">git-submodule(
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-04-24 02:56:09 UTC
+Last updated 2010-06-19 00:32:57 UTC
</div>
</div>
</body>