commit a8f7f0667129a1a5ae62c5692bdb6a0f177c5659
from: Stefan Sperling <stsp@stsp.name>
date: Tue Aug 29 13:32:50 2023 UTC

sync man pages

commit - c7d49e4af4835c9ea9b1215adf4791b08496d58c
commit + a8f7f0667129a1a5ae62c5692bdb6a0f177c5659
blob - 5e75d273aad07eee93d005dc742347f3c31cd173
blob + 8fc4b88df6aaf9b6ca9dd9dc981fd6af19f09622
--- git-repository.5.html
+++ git-repository.5.html
@@ -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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 08e2e3a332dcfb1c79061dec71230aa94190e15a
blob + c63d05d1d627f979599fb7ee146eb27e9602189f
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 6071c6dc6fa95ce97459e7db018c6c520c7b72ca
blob + 62d7559173b70af9c9f2baa0cd780341346c918c
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 8275943f5604e103f6495b02c2da3c81831702db
blob + 2d1c7482e6018e5043dca6e69e7aa27143836a4c
--- got.1.html
+++ got.1.html
@@ -772,7 +772,9 @@
       </dd>
       <dt id="d~2"><a class="permalink" href="#d~2"><code class="Fl">-d</code></a></dt>
       <dd>Display diffstat of changes introduced in each commit. Cannot be used
-          with the <code class="Fl">-s</code> option.</dd>
+          with the <code class="Fl">-s</code> option. Implies the
+          <code class="Fl">-P</code> option (diffstat displays a list of changed
+          paths).</dd>
       <dt id="l~3"><a class="permalink" href="#l~3"><code class="Fl">-l</code></a>
         <var class="Ar">N</var></dt>
       <dd>Limit history traversal to a given number of commits. If this option
@@ -835,9 +837,11 @@
       <dt id="x"><a class="permalink" href="#x"><code class="Fl">-x</code></a>
         <var class="Ar">commit</var></dt>
       <dd>Stop traversing commit history immediately after the specified
-          <var class="Ar">commit</var> has been traversed. This option has no
-          effect if the specified <var class="Ar">commit</var> is never
-          traversed.</dd>
+          <var class="Ar">commit</var> has been traversed. Like
+          <code class="Fl">-c</code>, the expected <var class="Ar">commit</var>
+          argument is a commit ID SHA1 hash, or a reference name or a keyword
+          which will be resolved to a commit ID. This option has no effect if
+          the specified <var class="Ar">commit</var> is never traversed.</dd>
     </dl>
   </dd>
   <dt id="di"><a class="permalink" href="#diff"><code class="Cm" id="diff">diff</code></a>
@@ -1236,11 +1240,13 @@
         <table class="Bl-column">
           <tr>
             <td>*</td>
-            <td>work tree's base commit matches the branch tip</td>
+            <td>work tree's base commit and the base commit of all tracked files
+              matches the branch tip</td>
           </tr>
           <tr>
             <td>~</td>
-            <td>work tree's base commit is out-of-date</td>
+            <td>work tree comprises mixed commits or its base commit is
+              out-of-date</td>
           </tr>
         </table>
       </dd>
@@ -3484,7 +3490,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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 867c14ae25405d5ebc9bf533cd09c1960ccae489
blob + 442892e4e4592f3e2de6635d2425885f7e22fd86
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - f8800727e150ab3c2814676b096e8ade0e09ca58
blob + e0bb9eca1b12258924a9e79dfbf127127e390ce1
--- gotadmin.1.html
+++ gotadmin.1.html
@@ -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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 18dff53036e5f4204a3e7375b7b27ce180a405f8
blob + 7ff258f58cd8c659e8318cb6f6bad5f48b03bcf3
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - c418e6541a573c2184fbf60e7bcf765f947dbd83
blob + c5803807544a3e38b1fd33bc5129488f08a013d7
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 1ade4255b184333997e498ec2c3122c645e9d681
blob + fe8e7e2c09cd1147c3862a737f29e17acbf59241
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - c8e411e4e7baba8677fe33e4f160ad192026c5d6
blob + d63af16ff310601bda07bdf9ab879cce29fb50fe
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 9147cbfe858dac841aaed05191542eeda383efe9
blob + 83ebb31b78063377a599837266a8cd4583a293ee
--- 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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 83129d6cecd4180faf66f997a15a4909abeeaab1
blob + ded801beb38cbebe1f165d0fb892f5dfe02288bc
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
@@ -248,7 +248,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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 558c1e2e02380fe50f40487af87da93f21cd7af9
blob + 2c517f4721ba597822f2b4982214e650db5b2b8d
--- tog.1.html
+++ tog.1.html
@@ -149,6 +149,20 @@
       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">If invoked in a work tree, the log entry of the work tree's
+        base commit will be prefixed with one of the following annotations:</p>
+    <table class="Bl-column">
+      <tr>
+        <td>*</td>
+        <td>work tree's base commit and the base commit of all tracked files
+          matches the branch tip</td>
+      </tr>
+      <tr>
+        <td>~</td>
+        <td>work tree comprises mixed commits or its base commit is
+          out-of-date</td>
+      </tr>
+    </table>
     <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
@@ -833,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">July 19,
+  line"><span class="foot-left"></span><span class="foot-date">August 29,
   2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>