commit - 1a0db3e696483fb8ea38febc05e33974560dd839
commit + c8cf51c90d37a26462530bab8b850e6623671802
blob - 0d405970e647b5702154e08211b5653409144c23
blob + e1b1c8a7403eb35464c5f829845f3300d400aae7
--- git-repository.5.html
+++ git-repository.5.html
@@ -36,7 +36,7 @@
 <h2 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h2>
 <p class="Pp">A Git repository stores a series of versioned snapshots of a file
     hierarchy. Conceptually, the repository's data model is a directed acyclic
-    graph which contains three types of objects as nodes:</p>
+    graph which contains four types of objects as nodes:</p>
 <dl class="Bl-tag">
   <dt id="blob">Blobs</dt>
   <dd>The content of tracked files is stored in objects of type
@@ -214,7 +214,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - d699a36be6fffa5df80d8aa5dfab5edeca170851
blob + 15ac112a07331045b912213b898fed6fefdbdbc6
--- gitwrapper.1.html
+++ gitwrapper.1.html
@@ -142,7 +142,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 99c3a1911beeca547ff7ac7c8de077da43a7b126
blob + c66104c2e6232e60304dbb4dbe17bc3f673778d2
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -186,7 +186,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 863a689f632c229a03b7fd3d2f01823b4dbdce89
blob + 94b458d45b48ecb88291d697fce29d80e67ec966
--- got.1.html
+++ got.1.html
@@ -2345,14 +2345,8 @@
       </tr>
       <tr id="mesg">
         <td><a class="permalink" href="#mesg"><code class="Cm">mesg</code></a>
-          [<var class="Ar">log-message</var>]</td>
-        <td>Create a new log message for the commit of a preceding
-          <code class="Cm">pick</code> or <code class="Cm">edit</code> command
-          on the previous line of the histedit script. The optional
-          <var class="Ar">log-message</var> argument provides a new single-line
-          log message to use. If the <var class="Ar">log-message</var> argument
-          is omitted, open an editor where a new log message can be
-          written.</td>
+          <var class="Ar">commit</var></td>
+        <td>Open an editor to create a new log message for this commit.</td>
       </tr>
     </table>
     <p class="Pp">Every commit in the history being edited must be mentioned in
@@ -2581,30 +2575,33 @@
     <div class="Bd Bd-indent"><code class="Li">(alias:
       <code class="Cm">mg</code>)</code></div>
     Merge the specified <var class="Ar">branch</var> into the current branch of
-      the work tree. If the branches have diverged, creates a merge commit.
-      Otherwise, if <var class="Ar">branch</var> already includes all commits
-      from the work tree's branch, updates the work tree's branch to be the same
-      as <var class="Ar">branch</var> without creating a commit, and updates the
-      work tree to the most recent commit on the branch.
-    <p class="Pp">If a linear project history is desired, then use of
-        <code class="Cm">got rebase</code> should be preferred over
-        <code class="Cm">got merge</code>. However, even strictly linear
-        projects may require merge commits in order to merge in new versions of
-        third-party code stored on vendor branches created with
-        <code class="Cm">got import</code>.</p>
+      the work tree. If the branches have diverged, merge changes into the work
+      tree and create a merge commit. Otherwise, if the specified
+      <var class="Ar">branch</var> is already based on the work tree's current
+      branch, make the work tree's current branch equivalent to the specified
+      <var class="Ar">branch</var> and update files in the work tree
+      accordingly.
     <p class="Pp">Merge commits are commits based on multiple parent commits.
-        The tip commit of the work tree's current branch, which must be in the
-        &#x201C;refs/heads/&#x201D; reference namespace and must be set with
-        <code class="Cm">got update -b</code> before starting the
-        <code class="Cm">merge</code> operation, will be used as the first
-        parent. The tip commit of the specified <var class="Ar">branch</var>
-        will be used as the second parent.</p>
+        The tip commit of the work tree's current branch will be used as the
+        first parent. The tip commit of the specified
+        <var class="Ar">branch</var> will be used as the second parent. The work
+        tree's current branch must be in the &#x201C;refs/heads/&#x201D;
+        reference namespace and can be set with <code class="Cm">got update
+        -b</code> before starting the <code class="Cm">merge</code>
+      operation.</p>
     <p class="Pp">No ancestral relationship between the two branches is
         required. If the two branches have already been merged previously, only
         new changes will be merged.</p>
     <p class="Pp">It is not possible to create merge commits with more than two
         parents. If more than one branch needs to be merged, then multiple merge
         commits with two parents each can be created in sequence.</p>
+    <p class="Pp">If a linear project history is desired, then use of
+        <code class="Cm">got rebase</code> should generally be preferred over
+        <code class="Cm">got merge</code>. However, even strictly linear
+        projects may require occasional merge commits, for example in order to
+        merge in new versions of third-party code stored on
+        &#x201C;vendor&#x201D; branches created with <code class="Cm">got
+        import</code>.</p>
     <p class="Pp">While merging changes found on the
         <var class="Ar">branch</var> into the work tree, show the status of each
         affected file, using the following status codes:</p>
@@ -3490,7 +3487,7 @@ remote &quot;origin&quot; {
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 9aa4dbe72113ce28ade8f223e499764b0b783de1
blob + 58cfd1e30dd75b91c48f73dbbfdfca5908ae68b7
--- got.conf.5.html
+++ got.conf.5.html
@@ -306,7 +306,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 8a7bcb3cc91a6a0e1bf2cac36fa66d322b88129c
blob + 992934f878867711650b81217e909a437af503b4
--- gotadmin.1.html
+++ gotadmin.1.html
@@ -262,11 +262,11 @@
         as follows:</p>
     <dl class="Bl-tag">
       <dt id="a~2"><a class="permalink" href="#a~2"><code class="Fl">-a</code></a></dt>
-      <dd>Delete all loose objects. By default, objects which are newer than an
-          implementation-defined modification timestamp are kept on disk to
-          prevent race conditions with other commands that add new objects to
-          the repository while <code class="Cm">gotadmin cleanup</code> is
-          running.</dd>
+      <dd>Delete all redundant loose and packed objects. By default, objects
+          which are newer than an implementation-defined modification timestamp
+          are kept on disk to prevent race conditions with other commands that
+          add new objects to the repository while <code class="Cm">gotadmin
+          cleanup</code> is running.</dd>
       <dt id="n"><a class="permalink" href="#n"><code class="Fl">-n</code></a></dt>
       <dd>Display the usual progress output and summary information but do not
           actually remove any files from disk.</dd>
@@ -424,7 +424,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - c14daf3b4044045a3ea0451fceb98dbab5b36976
blob + 3168d17174c14dc391f0c6b31b2958cc6cc32609
--- gotctl.8.html
+++ gotctl.8.html
@@ -86,7 +86,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - e047b90dac084a933d1950405bee98ff8fa87ec6
blob + d499088fea0306ad3545b61b1f3276af2ead9adf
--- gotd.8.html
+++ gotd.8.html
@@ -99,7 +99,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 9cf1b3e3be49bdf83dcce7e21b837140e02fd441
blob + e4b24fffa4d7b7476bf5450db196f58e9cd585e4
--- gotd.conf.5.html
+++ gotd.conf.5.html
@@ -265,7 +265,7 @@ connection {
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - a04a4f8d35e52cb022d3fcfc1991b13fbe154e8b
blob + 697d655ceeb51048bd9c8d67b37bc71dcacdefc9
--- gotsh.1.html
+++ gotsh.1.html
@@ -157,7 +157,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 9a8d9596fba89fa9fda777eeea7eae55af40e2b4
blob + c5d4530eb099b8ee45c4bfa2bf5682924e372cae
--- gotwebd.8.html
+++ gotwebd.8.html
@@ -185,7 +185,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 2e5414f5b554d1c5374145ae3b5a9d3e074e5706
blob + 3ad1b885d83ab55e88548ecc1c50add7a2ee8a5c
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
@@ -100,19 +100,13 @@ listen on $lan_addr</pre>
     on</code></a> <var class="Ar">address</var> <code class="Ic">port</code>
     <var class="Ar">number</var></dt>
   <dd>Configure an address and port for incoming FCGI TCP connections. Valid
-      <var class="Ar">address</var> arguments are hostnames, IP4 addresses, IPv6
-      addresses, and network interface names. The <var class="Ar">port</var>
-      argument may be number or a service name defined in
-      <a class="Xr" aria-label="services, section 5">services(5)</a>.
+      <var class="Ar">address</var> arguments are hostnames, IP4 addresses and
+      IPv6 addresses. The <var class="Ar">port</var> argument may be number or a
+      service name defined in <a class="Xr" aria-label="services, section
+      5">services(5)</a>.
     <p class="Pp">May be specified multiple times to build up a list of
         listening sockets. However, a given combination of address and port may
         only be used by one server.</p>
-    <p class="Pp">If a network interface name is given as
-        <var class="Ar">address</var> argument then
-        <a class="Xr" aria-label="gotwebd, section 8">gotwebd(8)</a> will obtain
-        the list of addresses on this interface only on startup. Any future
-        changes to the address configuration of the interface will be
-      ignored.</p>
   </dd>
   <dt id="listen~2"><a class="permalink" href="#listen~2"><code class="Ic">listen
     on socket off</code></a></dt>
@@ -248,7 +242,7 @@ server &quot;localhost-unix&quot; {
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>
blob - 0c4585295ad724e27f02ed62d0787331626406a9
blob + 77ddf3825a9b6f1f879f891e19ae34c94abe2f0c
--- tog.1.html
+++ tog.1.html
@@ -796,7 +796,7 @@
   <dd>Determines the default diff algorithm used by <code class="Nm">tog</code>.
       Supported diff algorithms are Myers (quick and dirty) and Patience (slow
       and tidy). Valid values for <code class="Ev">TOG_DIFF_ALGORITHM</code> are
-      &#x201C;patience&#x201D; and &#x201C;myers&#x201D;. If unset, the Myers
+      &#x201C;patience&#x201D; and &#x201C;myers&#x201D;. If unset, the Patience
       diff algorithm will be used by default.</dd>
   <dt id="TOG_VIEW_SPLIT_MODE"><a class="permalink" href="#TOG_VIEW_SPLIT_MODE"><code class="Ev">TOG_VIEW_SPLIT_MODE</code></a></dt>
   <dd>Determines the default layout of split-screen views. If set to
@@ -847,7 +847,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">September 18,
-  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">November 29,
+  2023</span> <span class="foot-os">OpenBSD 7.4</span></div>
 </body>
 </html>