Commit Diff


commit - 5c074389f63c119210704d88bfdf6c73c41628f8
commit + 7c3b4ab81d876a0e07ae5b2c6c593a7b25458ba6
blob - ec9606b4475cf810e09b0e9111713756cef444a7
blob + e6e2fa5599ccc7c365827f8f1cc11196218b30d0
--- git-repository.5.html
+++ git-repository.5.html
@@ -208,7 +208,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">February 18, 2020</td>
+    <td class="foot-date">February 25, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 5f8314ad2defb4b2fea3e186d3a3ecd08c1389c0
blob + 815d8191d231537981dceadf631c6f1d69b89923
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -174,7 +174,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">February 18, 2020</td>
+    <td class="foot-date">February 25, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - 999728f012721a0813a2c1d886f685751bd37fd7
blob + 1abcaf63a60ce2685427d34f5ab4ceba5503b9f8
--- got.1.html
+++ got.1.html
@@ -367,7 +367,11 @@
     [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
     [<var class="Ar">path</var>]</dt>
   <dd>Display history of a repository. If a <var class="Ar">path</var> is
-      specified, show only commits which modified this path.
+      specified, show only commits which modified this path. If invoked in a
+      work tree, the <var class="Ar">path</var> is interpreted relative to the
+      current working directory, and the work tree's path prefix is implicitly
+      prepended. Otherwise, the path is interpreted relative to the repository
+      root.
     <p class="Pp">The options for <code class="Cm">got log</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -573,18 +577,56 @@
     [<code class="Fl">-c</code> <var class="Ar">commit</var>]
     [<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>]</dt>
-  <dd>Manage branches in a repository.
+    <var class="Ar">name</var>] [<code class="Fl">-n</code>]
+    [<var class="Ar">name</var>]</dt>
+  <dd>Create, list, or delete branches.
     <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 invoked in a work tree without any arguments, print the
-        name of the work tree's current branch. If a <var class="Ar">name</var>
-        argument is passed, attempt to create a branch reference with the given
-        name. By default the new branch reference will point at the latest
-        commit on the work tree's current branch if invoked in a work tree, and
-        otherwise to a commit resolved via the repository's HEAD reference.</p>
+        name of the work tree's current branch.</p>
+    <p class="Pp">If a <var class="Ar">name</var> argument is passed, attempt to
+        create a branch reference with the given name. By default the new branch
+        reference will point at the latest commit on the work tree's current
+        branch if invoked in a work tree, and otherwise to a commit resolved via
+        the repository's HEAD reference.</p>
+    <p class="Pp">If invoked in a work tree, once the branch was created
+        successfully switch the work tree's head reference to the newly created
+        branch and update files across the entire work tree, just like
+        <code class="Cm">got update -b</code> <var class="Ar">name</var> would
+        do. Show the status of each affected file, using the following status
+        codes:</p>
+    <table class="Bl-column">
+      <tr>
+        <td>U</td>
+        <td>file was updated and contained no local changes</td>
+      </tr>
+      <tr>
+        <td>G</td>
+        <td>file was updated and local changes were merged cleanly</td>
+      </tr>
+      <tr>
+        <td>C</td>
+        <td>file was updated and conflicts occurred during merge</td>
+      </tr>
+      <tr>
+        <td>D</td>
+        <td>file was deleted</td>
+      </tr>
+      <tr>
+        <td>A</td>
+        <td>new file was added</td>
+      </tr>
+      <tr>
+        <td>~</td>
+        <td>versioned file is obstructed by a non-regular file</td>
+      </tr>
+      <tr>
+        <td>!</td>
+        <td>a missing versioned file was restored</td>
+      </tr>
+    </table>
     <p class="Pp">The options for <code class="Cm">got branch</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -622,15 +664,18 @@
           the branch reference is deleted. Any commit, tree, and blob objects
           belonging to the branch remain in the repository and may be removed
           separately with Git's garbage collector.</dd>
+      <dt><a class="permalink" href="#n"><code class="Fl" id="n">-n</code></a></dt>
+      <dd>Do not switch and update the work tree after creating a new
+        branch.</dd>
     </dl>
   </dd>
   <dt><a class="permalink" href="#br"><code class="Cm" id="br">br</code></a></dt>
   <dd>Short alias for <code class="Cm">branch</code>.</dd>
   <dt><a class="permalink" href="#tag"><code class="Cm" id="tag">tag</code></a>
+    [<code class="Fl">-c</code> <var class="Ar">commit</var>]
     [<code class="Fl">-m</code> <var class="Ar">message</var>]
     [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
-    [<code class="Fl">-l</code>] <var class="Ar">name</var>
-    [<var class="Ar">commit</var>]</dt>
+    [<code class="Fl">-l</code>] <var class="Ar">name</var></dt>
   <dd>Manage tags in a repository.
     <p class="Pp">Tags are managed via references which live in the
         &#x201C;refs/tags/&#x201D; reference namespace. The <code class="Cm">got
@@ -638,21 +683,26 @@
         References in this namespace point at tag objects which contain a
         pointer to another object, a tag message, as well as author and
         timestamp information.</p>
-    <p class="Pp">Expect one or two arguments and attempt to create a tag with
-        the given <var class="Ar">name</var>, and make this tag point at the
-        given <var class="Ar">commit</var>. If no commit is specified, default
-        to the latest commit on the work tree's current branch if invoked in a
-        work tree, and to a commit resolved via the repository's HEAD reference
-        otherwise. Otherwise, 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.</p>
+    <p class="Pp">Attempt to create a tag with the given
+        <var class="Ar">name</var>, and make this tag point at the given
+        <var class="Ar">commit</var>. If no commit is specified, default to the
+        latest commit on the work tree's current branch if invoked in a work
+        tree, and to a commit resolved via the repository's HEAD reference
+        otherwise.</p>
     <p class="Pp">The options for <code class="Cm">got tag</code> are as
         follows:</p>
     <dl class="Bl-tag">
+      <dt><a class="permalink" href="#c_7"><code class="Fl" id="c_7">-c</code></a>
+        <var class="Ar">commit</var></dt>
+      <dd>Make the newly created tag reference point at the specified
+          <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.
+          An abbreviated hash argument will be expanded to a full SHA1 hash
+          automatically, provided the abbreviation is unique.</dd>
       <dt><a class="permalink" href="#m_2"><code class="Fl" id="m_2">-m</code></a>
         <var class="Ar">message</var></dt>
-      <dd>Use the specified tag message when creating the new tag Without the
+      <dd>Use the specified tag message when creating the new tag. Without the
           <code class="Fl">-m</code> option, <code class="Cm">got tag</code>
           opens a temporary file in an editor where a tag message can be
           written.</dd>
@@ -927,6 +977,15 @@
       commit shared by the specified <var class="Ar">branch</var> and the work
       tree's current branch, and stops once the tip commit of the specified
       <var class="Ar">branch</var> has been rebased.
+    <p class="Pp">When <code class="Cm">got rebase</code> is used as intended,
+        the specified <var class="Ar">branch</var> contains changes made in
+        local commits that are not yet visible in any other repositories. The
+        work tree's current branch, which must be set with <code class="Cm">got
+        update -b</code> before starting the <code class="Cm">rebase</code>
+        operation, represents a branch from a remote repository which shares a
+        common history with the specified <var class="Ar">branch</var> but has
+        at some point diverged due to commits added to the remote
+      repository.</p>
     <p class="Pp">Rebased commits are accumulated on a temporary branch which
         the work tree will remain switched to throughout the entire rebase
         operation. Commits on this branch represent the same changes with the
@@ -997,7 +1056,7 @@
       <dt><a class="permalink" href="#a"><code class="Fl" id="a">-a</code></a></dt>
       <dd>Abort an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.</dd>
-      <dt><a class="permalink" href="#c_7"><code class="Fl" id="c_7">-c</code></a></dt>
+      <dt><a class="permalink" href="#c_8"><code class="Fl" id="c_8">-c</code></a></dt>
       <dd>Continue an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.</dd>
     </dl>
@@ -1006,17 +1065,31 @@
   <dd>Short alias for <code class="Cm">rebase</code>.</dd>
   <dt><a class="permalink" href="#histedit"><code class="Cm" id="histedit">histedit</code></a>
     [<code class="Fl">-a</code>] [<code class="Fl">-c</code>]
-    [<code class="Fl">-F</code> <var class="Ar">histedit-script</var>]</dt>
+    [<code class="Fl">-F</code> <var class="Ar">histedit-script</var>]
+    [<code class="Fl">-m</code>]</dt>
   <dd>Edit commit history between the work tree's current base commit and the
       tip commit of the work tree's current branch.
+    <p class="Pp">Before starting a <code class="Cm">histedit</code> operation
+        the work tree's current branch must be set with <code class="Cm">got
+        update -b</code> to the branch which should be edited, unless this
+        branch is already the current branch of the work tree. The tip of this
+        branch represents the upper bound (inclusive) of commits touched by the
+        <code class="Cm">histedit</code> operation.</p>
+    <p class="Pp">Furthermore, the work tree's base commit must be set with
+        <code class="Cm">got update -c</code> to a point in this branch's commit
+        history where editing should begin. This commit represents the lower
+        bound (non-inclusive) of commits touched by the
+        <code class="Cm">histedit</code> operation.</p>
     <p class="Pp">Editing of commit history is controlled via a
-        <var class="Ar">histedit script</var> which can be edited interactively
-        or passed on the command line. The format of the histedit script is
-        line-based. Each line in the script begins with a command name, followed
-        by whitespace and an argument. For most commands, the expected argument
-        is a commit ID SHA1 hash. Any remaining text on the line is ignored.
-        Lines which begin with the &#x2018;#&#x2019; character are ignored
-        entirely.</p>
+        <var class="Ar">histedit script</var> which can be written in an editor
+        based on a template, passed on the command line, or generated with the
+        <code class="Fl">-m</code> option if only log messages need to be
+        edited.</p>
+    <p class="Pp">The format of the histedit script is line-based. Each line in
+        the script begins with a command name, followed by whitespace and an
+        argument. For most commands, the expected argument is a commit ID SHA1
+        hash. Any remaining text on the line is ignored. Lines which begin with
+        the &#x2018;#&#x2019; character are ignored entirely.</p>
     <p class="Pp">The available commands are as follows:</p>
     <table class="Bl-column">
       <tr>
@@ -1105,9 +1178,10 @@
         the edited history contains changes to files outside of the work tree's
         path prefix, the work tree cannot be used to edit the history of this
         branch.</p>
-    <p class="Pp">The <code class="Cm">got update</code> command will refuse to
-        run while a histedit operation is in progress. Other commands which
-        manipulate the work tree may be used, and the <code class="Cm">got
+    <p class="Pp">The <code class="Cm">got update</code>, <code class="Cm">got
+        rebase</code>, and <code class="Cm">got integrate</code> commands will
+        refuse to run while a histedit operation is in progress. Other commands
+        which manipulate the work tree may be used, and the <code class="Cm">got
         commit</code> command may be used to commit arbitrary changes to the
         temporary branch while the histedit operation is interrupted.</p>
     <p class="Pp">The options for <code class="Cm">got histedit</code> are as
@@ -1116,9 +1190,20 @@
       <dt><a class="permalink" href="#a_2"><code class="Fl" id="a_2">-a</code></a></dt>
       <dd>Abort an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.</dd>
-      <dt><a class="permalink" href="#c_8"><code class="Fl" id="c_8">-c</code></a></dt>
+      <dt><a class="permalink" href="#c_9"><code class="Fl" id="c_9">-c</code></a></dt>
       <dd>Continue an interrupted histedit operation. If this option is used, no
           other command-line arguments are allowed.</dd>
+      <dt><a class="permalink" href="#F_2"><code class="Fl" id="F_2">-F</code></a>
+        <var class="Ar">histedit-script</var></dt>
+      <dd>Use the specified <var class="Ar">histedit-script</var> instead of
+          opening a temporary file in an editor where a histedit script can be
+          written.</dd>
+      <dt><a class="permalink" href="#m_4"><code class="Fl" id="m_4">-m</code></a></dt>
+      <dd>Edit log messages only. This option is a quick equivalent to a
+          histedit script which edits only log messages but otherwise leaves
+          every picked commit as-is. The <code class="Fl">-m</code> option can
+          only be used when starting a new histedit operation. If this option is
+          used, no other command-line arguments are allowed.</dd>
     </dl>
   </dd>
   <dt><a class="permalink" href="#he"><code class="Cm" id="he">he</code></a></dt>
@@ -1232,7 +1317,7 @@
           individual patches derived from the modified file content can be
           staged. Files in added or deleted status may only be staged or
           rejected in their entirety.</dd>
-      <dt><a class="permalink" href="#F_2"><code class="Fl" id="F_2">-F</code></a>
+      <dt><a class="permalink" href="#F_3"><code class="Fl" id="F_3">-F</code></a>
         <var class="Ar">response-script</var></dt>
       <dd>With the <code class="Fl">-p</code> option, read &#x201C;y&#x201D;,
           &#x201C;n&#x201D;, and &#x201C;q&#x201D; responses line-by-line from
@@ -1302,7 +1387,7 @@
           If a file is staged in modified status, individual patches derived
           from the staged file content can be unstaged. Files staged in added or
           deleted status may only be unstaged in their entirety.</dd>
-      <dt><a class="permalink" href="#F_3"><code class="Fl" id="F_3">-F</code></a>
+      <dt><a class="permalink" href="#F_4"><code class="Fl" id="F_4">-F</code></a>
         <var class="Ar">response-script</var></dt>
       <dd>With the <code class="Fl">-p</code> option, read &#x201C;y&#x201D;,
           &#x201C;n&#x201D;, and &#x201C;q&#x201D; responses line-by-line from
@@ -1332,7 +1417,7 @@
     <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_9"><code class="Fl" id="c_9">-c</code></a>
+      <dt><a class="permalink" href="#c_10"><code class="Fl" id="c_10">-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
@@ -1451,6 +1536,20 @@
     branch resolved via the repository's HEAD reference, respectively:</p>
 <p class="Pp"></p>
 <div class="Bd Bd-indent"><code class="Li">$ got log -p -l 3</code></div>
+<p class="Pp">In a work tree or a git repository directory, log the history of a
+    subdirectory:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got log sys/uvm</code></div>
+<p class="Pp">While operating inside a work tree, paths are specified relative
+    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 &amp;&amp; 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 &amp;&amp; got log
+  ../../uvm</code></div>
 <p class="Pp">Add new files and remove obsolete files in a work tree
   directory:</p>
 <p class="Pp"></p>
@@ -1545,6 +1644,13 @@
 <div class="Bd Bd-indent"><code class="Li">$ got update -b
   origin/master</code></div>
 <div class="Bd Bd-indent"><code class="Li">$ got rebase master</code></div>
+<p class="Pp">On the &#x201C;master&#x201D; branch, log messages for local
+    changes can now be amended with &#x201C;OK&#x201D; by other developers and
+    any other important new information:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got update -c
+  origin/master</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got histedit -m</code></div>
 <p class="Pp">Local changes on the &#x201C;master&#x201D; branch can then be
     pushed to the remote repository with <code class="Cm">git push</code>:</p>
 <p class="Pp"></p>
@@ -1598,7 +1704,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">February 18, 2020</td>
+    <td class="foot-date">February 25, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - d14ad9cb4effa9916d43ab163beb43c0e35a65fa
blob + af1ea58f1cbde8d51246d35408146258221a1e1e
--- gotweb.8.html
+++ gotweb.8.html
@@ -156,7 +156,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">February 18, 2020</td>
+    <td class="foot-date">February 25, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>
blob - c1c37d1c8fafa7fdc565f863195a38e59e369e9b
blob + 9b666b3705c06b13d7e8f78088e5b2b944c3af1e
--- tog.1.html
+++ tog.1.html
@@ -102,7 +102,11 @@
     <var class="Ar">commit</var>] [<code class="Fl">-r</code>
     <var class="Ar">repository-path</var>] [<var class="Ar">path</var>]</dt>
   <dd>Display history of a repository. If a <var class="Ar">path</var> is
-      specified, show only commits which modified this path.
+      specified, show only commits which modified this path. If invoked in a
+      work tree, the <var class="Ar">path</var> is interpreted relative to the
+      current working directory, and the work tree's path prefix is implicitly
+      prepended. Otherwise, the path is interpreted relative to the repository
+      root.
     <p class="Pp">This command is also executed if no explicit command is
         specified.</p>
     <p class="Pp">The key bindings for <code class="Cm">tog log</code> are as
@@ -173,19 +177,19 @@
       <dt><a class="permalink" href="#r"><code class="Fl" id="r">-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.</dd>
+          repository is located at or above the current working directory. If
+          this directory is a <a class="Xr">got(1)</a> work tree, use the
+          repository path associated with this work tree.</dd>
     </dl>
   </dd>
   <dt><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
-    [<var class="Ar">repository-path</var>] <var class="Ar">object1
-    object2</var></dt>
+    [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
+    <var class="Ar">object1 object2</var></dt>
   <dd>Display the differences between two objects in the repository. Each
       <var class="Ar">object</var> argument is an object ID SHA1 hash. An
       abbreviated hash argument will be expanded to a full SHA1 hash
       automatically, provided the abbreviation is unique. Both objects must be
-      of the same type (blobs, trees, or commits). If the
-      <var class="Ar">repository path</var> is omitted, use the current working
-      directory.
+      of the same type (blobs, trees, or commits).
     <p class="Pp">The key bindings for <code class="Cm">tog diff</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -222,6 +226,16 @@
       <dt><a class="permalink" href="#N_2"><code class="Cm" id="N_2">N</code></a></dt>
       <dd>Find the previous line which matches the current search pattern.</dd>
     </dl>
+    <p class="Pp">The options for <code class="Cm">tog diff</code> are as
+        follows:</p>
+    <dl class="Bl-tag">
+      <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
+          repository is located at or above the current working directory. If
+          this directory is a <a class="Xr">got(1)</a> work tree, use the
+          repository path associated with this work tree.</dd>
+    </dl>
   </dd>
   <dt><a class="permalink" href="#blame"><code class="Cm" id="blame">blame</code></a>
     [<code class="Fl">-c</code> <var class="Ar">commit</var>]
@@ -231,12 +245,18 @@
     <p class="Pp">The key bindings for <code class="Cm">tog blame</code> are as
         follows:</p>
     <dl class="Bl-tag">
-      <dt><a class="permalink" href="#Down-arrow,_j,_Page-down,_Space"><code class="Cm" id="Down-arrow,_j,_Page-down,_Space">Down-arrow,
-        j, Page-down, Space</code></a></dt>
+      <dt><a class="permalink" href="#Down-arrow,_j_2"><code class="Cm" id="Down-arrow,_j_2">Down-arrow,
+        j</code></a></dt>
       <dd>Move the selection cursor down.</dd>
-      <dt><a class="permalink" href="#Up-arrow,_k,_Page-up"><code class="Cm" id="Up-arrow,_k,_Page-up">Up-arrow,
-        k, Page-up</code></a></dt>
+      <dt><a class="permalink" href="#Up-arrow,_k_2"><code class="Cm" id="Up-arrow,_k_2">Up-arrow,
+        k</code></a></dt>
       <dd>Move the selection cursor up.</dd>
+      <dt><a class="permalink" href="#Page-down,_Space,_Ctrl+f_2"><code class="Cm" id="Page-down,_Space,_Ctrl+f_2">Page-down,
+        Space, Ctrl+f</code></a></dt>
+      <dd>Move the selection cursor down one page.</dd>
+      <dt><a class="permalink" href="#Page-up,_Ctrl+b_3"><code class="Cm" id="Page-up,_Ctrl+b_3">Page-up,
+        Ctrl+b</code></a></dt>
+      <dd>Move the selection cursor up one page.</dd>
       <dt><a class="permalink" href="#Enter"><code class="Cm" id="Enter">Enter</code></a></dt>
       <dd>Open a <code class="Cm">diff</code> view for the currently selected
           line's commit.</dd>
@@ -269,16 +289,20 @@
           branch or a commit ID SHA1 hash. 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_2"><code class="Fl" id="r_2">-r</code></a>
+      <dt><a class="permalink" href="#r_3"><code class="Fl" id="r_3">-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.</dd>
+          repository is located at or above the current working directory. If
+          this directory is a <a class="Xr">got(1)</a> work tree, use the
+          repository path associated with this work tree.</dd>
     </dl>
   </dd>
   <dt><a class="permalink" href="#tree"><code class="Cm" id="tree">tree</code></a>
     [<code class="Fl">-c</code> <var class="Ar">commit</var>]
-    [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]</dt>
-  <dd>Display the repository tree.
+    [<code class="Fl">-r</code> <var class="Ar">repository-path</var>]
+    [<var class="Ar">path</var>]</dt>
+  <dd>Display the repository tree. If a <var class="Ar">path</var> is specified,
+      show tree entries at this path.
     <p class="Pp">Displayed tree entries may carry one of the following trailing
         annotations:</p>
     <table class="Bl-column">
@@ -302,12 +326,18 @@
     <p class="Pp">The key bindings for <code class="Cm">tog tree</code> are as
         follows:</p>
     <dl class="Bl-tag">
-      <dt><a class="permalink" href="#Down-arrow,_j,_Page-down"><code class="Cm" id="Down-arrow,_j,_Page-down">Down-arrow,
-        j, Page-down</code></a></dt>
+      <dt><a class="permalink" href="#Down-arrow,_j_3"><code class="Cm" id="Down-arrow,_j_3">Down-arrow,
+        j</code></a></dt>
       <dd>Move the selection cursor down.</dd>
-      <dt><a class="permalink" href="#Up-arrow,_k,_Page-up_2"><code class="Cm" id="Up-arrow,_k,_Page-up_2">Up-arrow,
-        k, Page-up</code></a></dt>
+      <dt><a class="permalink" href="#Up-arrow,_k_3"><code class="Cm" id="Up-arrow,_k_3">Up-arrow,
+        k</code></a></dt>
       <dd>Move the selection cursor up.</dd>
+      <dt><a class="permalink" href="#Page-down,_Ctrl+f_2"><code class="Cm" id="Page-down,_Ctrl+f_2">Page-down,
+        Ctrl+f</code></a></dt>
+      <dd>Move the selection cursor down one page.</dd>
+      <dt><a class="permalink" href="#Page-up,_Ctrl+b_4"><code class="Cm" id="Page-up,_Ctrl+b_4">Page-up,
+        Ctrl+b</code></a></dt>
+      <dd>Move the selection cursor up one page.</dd>
       <dt><a class="permalink" href="#Enter_2"><code class="Cm" id="Enter_2">Enter</code></a></dt>
       <dd>Enter the currently selected directory, or switch to the
           <code class="Cm">blame</code> view for the currently selected
@@ -342,7 +372,7 @@
           branch or a commit ID SHA1 hash. 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_3"><code class="Fl" id="r_3">-r</code></a>
+      <dt><a class="permalink" href="#r_4"><code class="Fl" id="r_4">-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
@@ -421,7 +451,7 @@
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">February 18, 2020</td>
+    <td class="foot-date">February 25, 2020</td>
     <td class="foot-os">OpenBSD 6.6</td>
   </tr>
 </table>