commit ba0a4168983152937b4a6cf221c11285bab44a95
from: Stefan Sperling <stsp@stsp.name>
date: Mon Aug 26 14:15:06 2019 UTC

sync man pages

commit - 05d9bcf99aaa55fbe978457376e48492e05966a3
commit + ba0a4168983152937b4a6cf221c11285bab44a95
blob - 384a5c187c0056e9bf21c3eb9e7a9ab948a62519
blob + 82e8fe0bd5e92e5cc4c3d8ca79076684e2ac5585
--- git-repository.5.html
+++ git-repository.5.html
@@ -208,7 +208,7 @@ The particular set of disallowed characters in referen
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 23, 2019</td>
+    <td class="foot-date">August 26, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - 8060f9dcb94dab5cbf3d37b435b1395d18ec9304
blob + bbcbf3ff39dddd0dd81e3b8e07826d3bf36225c8
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -174,7 +174,7 @@ A Got <i class="Em">work tree</i> stores a file hierar
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 23, 2019</td>
+    <td class="foot-date">August 26, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - ece46d6f825c02b54fc5b035551436de48af8587
blob + ea8c46216f0009ff1988ea4f03d69c068c8cf902
--- got.1.html
+++ got.1.html
@@ -277,6 +277,11 @@
       <tr>
         <td>?</td>
         <td>unversioned item not tracked by <code class="Nm">got</code></td>
+      </tr>
+      <tr>
+        <td>N</td>
+        <td>non-existent <var class="Ar">path</var> specified on the command
+          line</td>
       </tr>
     </table>
     <p class="Pp">If no <var class="Ar">path</var> is specified, show
@@ -361,7 +366,9 @@
           <code class="Ev">GOT_LOG_DEFAULT_LIMIT</code> environment variable may
           be set to change this default value.</dd>
       <dt><a class="permalink" href="#p_2"><code class="Fl" id="p_2">-p</code></a></dt>
-      <dd>Display the patch of modifications made in each commit.</dd>
+      <dd>Display the patch of modifications made in each commit. If a
+          <var class="Ar">path</var> is specified, only show the patch of
+          modifications at or within this path.</dd>
       <dt><a class="permalink" href="#r_2"><code class="Fl" id="r_2">-r</code></a>
         <var class="Ar">repository-path</var></dt>
       <dd>Use the repository at the specified path. If not specified, assume the
@@ -452,6 +459,10 @@
         <td>*</td>
         <td>entry is an executable file</td>
       </tr>
+      <tr>
+        <td>$</td>
+        <td>entry is a Git submodule</td>
+      </tr>
     </table>
     <p class="Pp">If no <var class="Ar">path</var> is specified, list the
         repository path corresponding to the current directory of the work tree,
@@ -520,18 +531,21 @@
     [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
     [<code class="Fl">-l</code>] [<code class="Fl">-d</code>
     <var class="Ar">name</var>] [<var class="Ar">name</var>
-    [<var class="Ar">base-branch</var>]]</dt>
+    [<var class="Ar">commit</var>]]</dt>
   <dd>Manage branches in a repository.
     <p class="Pp">Branches are managed via references which live in the
         &#x201C;refs/heads/&#x201D; reference namespace. The
         <code class="Cm">got branch</code> command operates on references in
         this namespace only.</p>
     <p class="Pp">If no options are passed, expect one or two arguments and
-        attempt to create a branch with the given <var class="Ar">name</var>,
-        and make it point at the given <var class="Ar">base-branch</var>. If no
-        <var class="Ar">base-branch</var> is specified, default to the work
-        tree's current branch if invoked in a work tree, or to the repository's
-        HEAD reference.</p>
+        attempt to create a branch reference with the given
+        <var class="Ar">name</var>, and make it point at the given
+        <var class="Ar">commit</var>. The expected <var class="Ar">commit</var>
+        argument is a commit ID SHA1 hash or an existing reference or tag name
+        which will be resolved to a commit ID. If no
+        <var class="Ar">commit</var> is specified, default to the latest commit
+        on the work tree's current branch if invoked in a work tree, or to a
+        commit resolved via the repository's HEAD reference.</p>
     <p class="Pp">The options for <code class="Cm">got branch</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -1172,23 +1186,43 @@
   <dt><a class="permalink" href="#ug"><code class="Cm" id="ug">ug</code></a></dt>
   <dd>Short alias for <code class="Cm">unstage</code>.</dd>
   <dt><a class="permalink" href="#cat"><code class="Cm" id="cat">cat</code></a>
+    [<code class="Fl">-c</code> <var class="Ar">commit</var>]
     [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
-    <var class="Ar">object ...</var></dt>
-  <dd>Parse and print contents of specified objects to standard output in a
-      line-based text format. Treat each argument as a reference, a tag name, or
-      an object ID SHA1 hash. References will be resolved to an object ID. Tag
-      names will resolved to a tag object. An abbreviated hash argument will be
-      expanded to a full SHA1 hash automatically, provided the abbreviation is
-      unique.
+    <var class="Ar">arg ...</var></dt>
+  <dd>Parse and print contents of objects to standard output in a line-based
+      text format. Content of commit, tree, and tag objects is printed in a way
+      similar to the actual content stored in such objects. Blob object contents
+      are printed as they would appear in files on disk.
+    <p class="Pp">Attempt to interpret each argument as a reference, a tag name,
+        or an object ID SHA1 hash. References will be resolved to an object ID.
+        Tag names will resolved to a tag object. An abbreviated hash argument
+        will be expanded to a full SHA1 hash automatically, provided the
+        abbreviation is unique.</p>
+    <p class="Pp">If none of the above interpretations produce a valid result,
+        or if the <code class="Fl">-P</code> option is used, attempt to
+        interpret the argument as a path which will be resolved to the ID of an
+        object found at this path in the repository.</p>
     <p class="Pp">The options for <code class="Cm">got cat</code> are as
         follows:</p>
     <dl class="Bl-tag">
+      <dt><a class="permalink" href="#c_8"><code class="Fl" id="c_8">-c</code></a>
+        <var class="Ar">commit</var></dt>
+      <dd>Look up paths in the specified <var class="Ar">commit</var>. If this
+          option is not used, paths are looked up in the commit resolved via the
+          repository's HEAD reference. The expected argument is a commit ID SHA1
+          hash or an existing reference or tag name which will be resolved to a
+          commit ID. An abbreviated hash argument will be expanded to a full
+          SHA1 hash automatically, provided the abbreviation is unique.</dd>
       <dt><a class="permalink" href="#r_9"><code class="Fl" id="r_9">-r</code></a>
         <var class="Ar">repository-path</var></dt>
       <dd>Use the repository at the specified path. If not specified, assume the
           repository is located at or above the current working directory. If
           this directory is a <code class="Nm">got</code> work tree, use the
           repository path associated with this work tree.</dd>
+      <dt><a class="permalink" href="#P"><code class="Fl" id="P">-P</code></a></dt>
+      <dd>Interpret all arguments as paths only. This option can be used to
+          resolve ambiguity in cases where paths look like tag names, reference
+          names, or object IDs.</dd>
     </dl>
   </dd>
 </dl>
@@ -1405,7 +1439,7 @@ Clone an existing Git repository for use with <code cl
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 23, 2019</td>
+    <td class="foot-date">August 26, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - 6216afa959214f368c86ab7952aa3737ba1d6250
blob + 771e552de978a8a195a7d61360e2e134506d1a30
--- tog.1.html
+++ tog.1.html
@@ -277,6 +277,10 @@
       <tr>
         <td>*</td>
         <td>entry is an executable file</td>
+      </tr>
+      <tr>
+        <td>$</td>
+        <td>entry is a Git submodule</td>
       </tr>
     </table>
     <p class="Pp">The key bindings for <code class="Cm">tog tree</code> are as
@@ -349,7 +353,7 @@ The <code class="Nm">tog</code> utility exits&#x00A0;0
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 23, 2019</td>
+    <td class="foot-date">August 26, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>