commit - b12b35b0bfed03ae7f161da4a16c7fc4840694c6
commit + 002618392cac69640ad9c2be71f636b4ed2b6eb1
blob - b6bb9cac6ed249ef0cad685b99f35ca41c96dc20
blob + 53d71b604ad43a0786558ca3caf79bd5f1959af6
--- got.1.html
+++ got.1.html
<dd>Stage local changes at the specified paths for inclusion in the next
commit. Paths may be staged if they are added, modified, or deleted
according to <code class="Cm">got status</code>.
+ <p class="Pp">Show the status of each affected file, using the following
+ status codes:</p>
+ <table class="Bl-column">
+ <tr>
+ <td>A</td>
+ <td>file addition has been staged</td>
+ </tr>
+ <tr>
+ <td>M</td>
+ <td>file modification has been staged</td>
+ </tr>
+ <tr>
+ <td>D</td>
+ <td>file deletion has been staged</td>
+ </tr>
+ </table>
+ <p class="Pp">Staged file contents are saved in newly created blob objects
+ in the repository. These blobs will be referred to by tree objects once
+ staged changes have been committed.</p>
<p class="Pp">Staged changes affect the behaviour of <code class="Cm">got
commit</code>, <code class="Cm">got status</code>, and
<code class="Cm">got diff</code>. While paths with staged changes exist,
<dl class="Bl-tag">
<dt><a class="permalink" href="#l_4"><code class="Fl" id="l_4">-l</code></a></dt>
<dd>Instead of staging new changes, list paths which are already staged,
- along with the IDs of corresponding blob objects. Indicate staged
- status using the following status codes:
- <table class="Bl-column">
- <tr>
- <td>A</td>
- <td>file addition is staged</td>
- </tr>
- <tr>
- <td>M</td>
- <td>file modification is staged</td>
- </tr>
- <tr>
- <td>D</td>
- <td>file deletion is staged</td>
- </tr>
- </table>
- </dd>
+ along with the IDs of staged blob objects and stage status codes. If
+ paths were provided in the command line show the staged paths among
+ the specified paths. Otherwise, show all staged paths.</dd>
</dl>
<p class="Pp"><code class="Cm">got stage</code> will refuse to run if
certain preconditions are not met. If a file contains merge conflicts,
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 4, 2019</td>
+ <td class="foot-date">August 5, 2019</td>
<td class="foot-os">OpenBSD 6.5</td>
</tr>
</table>