commit 1e80276a5bffce3dab90a2376085959d96b67b5c
from: Stefan Sperling <stsp@stsp.name>
date: Fri Sep 03 11:14:02 2021 UTC

sync man pages

commit - 4a5055fc159f308768f97bdc65dc526aa97b034f
commit + 1e80276a5bffce3dab90a2376085959d96b67b5c
blob - 00731b881a126ef7bb1e27882f24a7309c0d1802
blob + beb0a3372435b4aac0247fc172e3e12f4733d9c1
--- git-repository.5.html
+++ git-repository.5.html
@@ -219,7 +219,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>
blob - e5faf2d3b241076853ed96c519591943dc5a75c8
blob + 6be2e8cc7207685c397ea0be535e6774ff40b11c
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -192,7 +192,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>
blob - dd66a0796c152d5fff8b41f87e9cb714ae161654
blob + 107a83cb3520e955d37a6e87e83363e9492fbbdc
--- got.1.html
+++ got.1.html
@@ -1409,7 +1409,7 @@
   <dt id="cherrypick"><a class="permalink" href="#cherrypick"><code class="Cm">cherrypick</code></a>
     <var class="Ar">commit</var></dt>
   <dd>Merge changes from a single <var class="Ar">commit</var> into the work
-      tree. The specified <var class="Ar">commit</var> must be on a different
+      tree. The specified <var class="Ar">commit</var> should be on a different
       branch than the work tree's base commit. The expected argument is a
       reference or a commit ID SHA1 hash. An abbreviated hash argument will be
       expanded to a full SHA1 hash automatically, provided the abbreviation is
@@ -1458,16 +1458,16 @@
     <p class="Pp"><code class="Cm">got cherrypick</code> will refuse to run if
         certain preconditions are not met. If the work tree contains multiple
         base commits it must first be updated to a single base commit with
-        <code class="Cm">got update</code>. If the work tree already contains
-        files with merge conflicts, these conflicts must be resolved first.</p>
+        <code class="Cm">got update</code>. If any relevant files already
+        contain merge conflicts, these conflicts must be resolved first.</p>
   </dd>
   <dt id="cy"><a class="permalink" href="#cy"><code class="Cm">cy</code></a></dt>
   <dd>Short alias for <code class="Cm">cherrypick</code>.</dd>
   <dt id="backout"><a class="permalink" href="#backout"><code class="Cm">backout</code></a>
     <var class="Ar">commit</var></dt>
   <dd>Reverse-merge changes from a single <var class="Ar">commit</var> into the
-      work tree. The specified <var class="Ar">commit</var> must be on the same
-      branch as the work tree's base commit. The expected argument is a
+      work tree. The specified <var class="Ar">commit</var> should be on the
+      same branch as the work tree's base commit. The expected argument is a
       reference or a commit ID SHA1 hash. An abbreviated hash argument will be
       expanded to a full SHA1 hash automatically, provided the abbreviation is
       unique.
@@ -1515,8 +1515,8 @@
     <p class="Pp"><code class="Cm">got backout</code> will refuse to run if
         certain preconditions are not met. If the work tree contains multiple
         base commits it must first be updated to a single base commit with
-        <code class="Cm">got update</code>. If the work tree already contains
-        files with merge conflicts, these conflicts must be resolved first.</p>
+        <code class="Cm">got update</code>. If any relevant files already
+        contain merge conflicts, these conflicts must be resolved first.</p>
   </dd>
   <dt id="bo"><a class="permalink" href="#bo"><code class="Cm">bo</code></a></dt>
   <dd>Short alias for <code class="Cm">backout</code>.</dd>
@@ -2183,7 +2183,7 @@
 <p class="Pp">Enable tab-completion of <code class="Nm">got</code> command names
     in <a class="Xr">ksh(1)</a>:</p>
 <p class="Pp"></p>
-<div class="Bd Bd-indent"><code class="Li">$ set -A complete_got -- $(got -h
+<div class="Bd Bd-indent"><code class="Li">$ set -A complete_got_1 -- $(got -h
   2&gt;&amp;1 | sed -n s/commands://p)</code></div>
 <p class="Pp">Clone an existing Git repository for use with
     <code class="Nm">got</code>.</p>
@@ -2483,7 +2483,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>
blob - c24d5f778d09e76339ea8d7b56c49ab17bb16ebd
blob + 6852e701bc349ea4ac2c57021bf898ea915962be
--- gotadmin.1.html
+++ gotadmin.1.html
@@ -303,7 +303,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>
blob - 27300db94ed9414c413489e57d5952e963c1a275
blob + 4b7cf52b9237ed87aa5b315cb62acdf35c14279e
--- gotweb.8.html
+++ gotweb.8.html
@@ -155,7 +155,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>
blob - c5b94de96924a4d54f77897fda23f1d816135761
blob + 8f468692ecf9113711d0b4ae02ece067aaa4a784
--- gotweb.conf.5.html
+++ gotweb.conf.5.html
@@ -171,7 +171,7 @@ got_logo_url			&quot;https://gameoftrees.org&quot;
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>
blob - 2a8f8cac86ea79acd8b24ac2a9d8b6d604a9fd53
blob + d6f8ecce0e402102b9dc12d00efa342966d450a4
--- tog.1.html
+++ tog.1.html
@@ -310,6 +310,12 @@
       <dt id="Page-up,~3"><a class="permalink" href="#Page-up,~3"><code class="Cm">Page-up,
         Ctrl+b</code></a></dt>
       <dd>Move the selection cursor up one page.</dd>
+      <dt id="Home,~3"><a class="permalink" href="#Home,~3"><code class="Cm">Home,
+        g</code></a></dt>
+      <dd>Move the selection cursor to the first line of the file.</dd>
+      <dt id="End,~3"><a class="permalink" href="#End,~3"><code class="Cm">End,
+        G</code></a></dt>
+      <dd>Move the selection cursor to the last line of the file.</dd>
       <dt id="Enter"><a class="permalink" href="#Enter"><code class="Cm">Enter</code></a></dt>
       <dd>Open a <code class="Cm">diff</code> view for the currently selected
           line's commit.</dd>
@@ -577,7 +583,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 31, 2021</td>
+    <td class="foot-date">September 3, 2021</td>
     <td class="foot-os">OpenBSD 7.0</td>
   </tr>
 </table>