Autogenerated HTML docs for v2.16.1-72-g5be1f

1 files changed, 14 insertions, 11 deletions

diff --git a/git-status.html b/git-status.html
index 493d5a268..26063af68 100644
--- a/git-status.html
+++ b/git-status.html
@@ -983,15 +983,16 @@ subdirectory (this is on purpose, to help cutting and pasting). See
 the status.relativePaths config option below.</p></div>

 <div class="sect2">

 <h3 id="_short_format">Short Format</h3>

-<div class="paragraph"><p>In the short-format, the status of each path is shown as</p></div>

+<div class="paragraph"><p>In the short-format, the status of each path is shown as one of these

+forms</p></div>

 <div class="literalblock">

 <div class="content">

-<pre><code>XY PATH1 -&gt; PATH2</code></pre>

+<pre><code>XY PATH

+XY ORIG_PATH -&gt; PATH</code></pre>

 </div></div>

-<div class="paragraph"><p>where <code>PATH1</code> is the path in the <code>HEAD</code>, and the " <code>-&gt; PATH2</code>" part is

-shown only when <code>PATH1</code> corresponds to a different path in the

-index/worktree (i.e. the file is renamed). The <code>XY</code> is a two-letter

-status code.</p></div>

+<div class="paragraph"><p>where <code>ORIG_PATH</code> is where the renamed/copied contents came

+from. <code>ORIG_PATH</code> is only shown when the entry is renamed or

+copied. The <code>XY</code> is a two-letter status code.</p></div>

 <div class="paragraph"><p>The fields (including the <code>-&gt;</code>) are separated from each other by a

 single space. If a filename contains whitespace or other nonprintable

 characters, that field will be quoted in the manner of a C string

@@ -1054,6 +1055,8 @@ C        [ MD]   copied in index
 [MARC]           index and work tree matches

 [ MARC]     M    work tree changed since index

 [ MARC]     D    deleted in work tree

+[ D]        R    renamed in work tree

+[ D]        C    copied in work tree

 -------------------------------------------------

 D           D    unmerged, both deleted

 A           U    unmerged, added by us

@@ -1175,13 +1178,13 @@ line types in any order.</p></div>
             of similarity between the source and target of the

             move or copy). For example "R100" or "C75".

 &lt;path&gt;      The pathname.  In a renamed/copied entry, this

-            is the path in the index and in the working tree.

+            is the target path.

 &lt;sep&gt;       When the `-z` option is used, the 2 pathnames are separated

             with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)

             byte separates them.

-&lt;origPath&gt;  The pathname in the commit at HEAD.  This is only

-            present in a renamed/copied entry, and tells

-            where the renamed/copied contents came from.

+&lt;origPath&gt;  The pathname in the commit at HEAD or in the index.

+            This is only present in a renamed/copied entry, and

+            tells where the renamed/copied contents came from.

 --------------------------------------------------------</code></pre>

 </div></div>

 <div class="paragraph"><p>Unmerged entries have the following format; the first character is

@@ -1284,7 +1287,7 @@ using <code>git --no-optional-locks status</code> (see <a href="git.html">git(1)
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-12-13 14:26:19 PST

+Last updated 2018-01-23 14:34:02 PST

 </div>

 </div>

 </body>