commit - 2dbbbc3a32777f5ac65125f54c00143193e2fbda
commit + 1554b33497cad214f9d8f385f9007cba5f0285b6
blob - c8edc309c1a6f08b814b87daabf6a8c2be424efe
blob + 9e7456114063e04e4c24904fda765e9b4bef0055
--- git-repository.5.html
+++ git-repository.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">July 23, 2020</td>
+ <td class="foot-date">August 2, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 71ba496e8d2e8748fcf634e1ff588b00eebbaf37
blob + 152df8aef174da28e6c4e26ea6523217d2893311
--- got-worktree.5.html
+++ got-worktree.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">July 23, 2020</td>
+ <td class="foot-date">August 2, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 39ba9dee00a41c6c57aba336efae0fda5d8d721b
blob + 24baf649ba8001d178764ad3b20cab3c5b2a7c2b
--- got.1.html
+++ got.1.html
empty repository before <code class="Cm">got checkout</code> can be
used.</p>
</dd>
- <dt id="in"><a class="permalink" href="#in"><code class="Cm">in</code></a></dt>
- <dd>Short alias for <code class="Cm">init</code>.</dd>
<dt id="import"><a class="permalink" href="#import"><code class="Cm">import</code></a>
[<code class="Fl">-b</code> <var class="Ar">branch</var>]
[<code class="Fl">-m</code> <var class="Ar">message</var>]
<td>#</td>
<td>file was not updated because it contains merge conflicts</td>
</tr>
+ <tr>
+ <td>?</td>
+ <td>changes destined for an unversioned file were not merged</td>
+ </tr>
</table>
<p class="Pp">If no <var class="Ar">path</var> is specified, update the
entire work tree. Otherwise, restrict the update operation to files at
<dd>Short alias for <code class="Cm">revert</code>.</dd>
<dt id="commit"><a class="permalink" href="#commit"><code class="Cm">commit</code></a>
[<code class="Fl">-m</code> <var class="Ar">message</var>]
- [<var class="Ar">path ...</var>]</dt>
+ [<code class="Fl">-S</code>] [<var class="Ar">path ...</var>]</dt>
<dd>Create a new commit in the repository from changes in a work tree and use
this commit as the new base commit for the work tree. If no
<var class="Ar">path</var> is specified, commit all changes in the work
the <code class="Fl">-m</code> option, <code class="Cm">got
commit</code> opens a temporary file in an editor where a log message
can be written.</dd>
+ <dt id="S"><a class="permalink" href="#S"><code class="Fl">-S</code></a></dt>
+ <dd>Allow the addition of symbolic links which point outside of the path
+ space that is under version control. By default, <code class="Cm">got
+ commit</code> will reject such symbolic links due to safety concerns.
+ As a precaution, <code class="Nm">got</code> may decide to represent
+ such a symbolic link as a regular file which contains the link's
+ target path, rather than creating an actual symbolic link which points
+ outside of the work tree. Use of this option is discouraged because
+ external mechanisms such as “make obj” are better suited
+ for managing symbolic links to paths not under version control.</dd>
</dl>
<p class="Pp"><code class="Cm">got commit</code> will refuse to run if
certain preconditions are not met. If the work tree's current branch is
<td>~</td>
<td>changes destined for a non-regular file were not merged</td>
</tr>
+ <tr>
+ <td>?</td>
+ <td>changes destined for an unversioned file were not merged</td>
+ </tr>
</table>
<p class="Pp">The merged changes will appear as local changes in the work
tree, which may be viewed with <code class="Cm">got diff</code>, amended
<td>~</td>
<td>changes destined for a non-regular file were not merged</td>
</tr>
+ <tr>
+ <td>?</td>
+ <td>changes destined for an unversioned file were not merged</td>
+ </tr>
</table>
<p class="Pp">The reverse-merged changes will appear as local changes in the
work tree, which may be viewed with <code class="Cm">got diff</code>,
<td>~</td>
<td>changes destined for a non-regular file were not merged</td>
</tr>
+ <tr>
+ <td>?</td>
+ <td>changes destined for an unversioned file were not merged</td>
+ </tr>
</table>
<p class="Pp">If merge conflicts occur the rebase operation is interrupted
and may be continued once conflicts have been resolved. Alternatively,
<td>~</td>
<td>changes destined for a non-regular file were not merged</td>
</tr>
+ <tr>
+ <td>?</td>
+ <td>changes destined for an unversioned file were not merged</td>
+ </tr>
</table>
<p class="Pp">If merge conflicts occur the histedit operation is interrupted
and may be continued once conflicts have been resolved. Alternatively,
<dt id="stage"><a class="permalink" href="#stage"><code class="Cm">stage</code></a>
[<code class="Fl">-l</code>] [<code class="Fl">-p</code>]
[<code class="Fl">-F</code> <var class="Ar">response-script</var>]
- [<var class="Ar">path ...</var>]</dt>
+ [<code class="Fl">-S</code>] [<var class="Ar">path ...</var>]</dt>
<dd>Stage local changes for inclusion in the next commit. If no
<var class="Ar">path</var> is specified, stage all changes in the work
tree. Otherwise, stage changes at or within the specified paths. Paths may
“n”, and “q” responses line-by-line from
the specified <var class="Ar">response-script</var> file instead of
prompting interactively.</dd>
+ <dt id="S~2"><a class="permalink" href="#S~2"><code class="Fl">-S</code></a></dt>
+ <dd>Allow staging of symbolic links which point outside of the path space
+ that is under version control. By default, <code class="Cm">got
+ stage</code> will reject such symbolic links due to safety concerns.
+ As a precaution, <code class="Nm">got</code> may decide to represent
+ such a symbolic link as a regular file which contains the link's
+ target path, rather than creating an actual symbolic link which points
+ outside of the work tree. Use of this option is discouraged because
+ external mechanisms such as “make obj” are better suited
+ for managing symbolic links to paths not under version control.</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,
resolve ambiguity in cases where paths look like tag names, reference
names, or object IDs.</dd>
</dl>
+ </dd>
+ <dt id="info"><a class="permalink" href="#info"><code class="Cm">info</code></a>
+ [<var class="Ar">path ...</var>]</dt>
+ <dd>Display meta-data stored in a work tree. See
+ <a class="Xr">got-worktree(5)</a> for details.
+ <p class="Pp">The work tree to use is resolved implicitly by walking upwards
+ from the current working directory.</p>
+ <p class="Pp">If one or more <var class="Ar">path</var> arguments are
+ specified, show additional per-file information for tracked files
+ located at or within these paths. If a <var class="Ar">path</var>
+ argument corresponds to the work tree's root directory, display
+ information for all tracked files.</p>
</dd>
</dl>
</section>
to the current working directory, so this command will log the subdirectory
<span class="Pa">sys/uvm</span>:</p>
<p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ cd sys/uvm && got log
- '.'</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ cd sys/uvm && got
+ log .</code></div>
<p class="Pp">And this command has the same effect:</p>
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ cd sys/dev/usb && got log
../../uvm</code></div>
+<p class="Pp">And this command displays work tree meta-data about all tracked
+ files:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ cd /usr/src</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got info . |
+ less</code></div>
<p class="Pp">Add new files and remove obsolete files in a work tree
directory:</p>
<p class="Pp"></p>
</div>
<table class="foot">
<tr>
- <td class="foot-date">July 23, 2020</td>
+ <td class="foot-date">August 2, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 8e24084b69795bf5b365d17b16088f605eebfa8e
blob + 6750cb73d5ff77033f0af3f3a93d82a85988af7e
--- gotweb.8.html
+++ gotweb.8.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">July 23, 2020</td>
+ <td class="foot-date">August 2, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 1d9d21da5d452df4192207d08cc232a6d9c06ca3
blob + b7f685334dc6665276444710655c12a80768086b
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">July 23, 2020</td>
+ <td class="foot-date">August 2, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
blob - 49d7df21a8bb721956dbf43237aab1e2a61f3467
blob + 6043ff0f90a02b33a76e254a018a5083c6d187a2
--- tog.1.html
+++ tog.1.html
</div>
<table class="foot">
<tr>
- <td class="foot-date">July 23, 2020</td>
+ <td class="foot-date">August 2, 2020</td>
<td class="foot-os">OpenBSD 6.7</td>
</tr>
</table>
