Commit Diff


commit - a4e48310aa18be470d3b0ceee743fff4365dabe5
commit + 7985a487e374c497dcec452960284d5d0347d9b6
blob - 2071f461886847700f08e45a07fa4d316ac1a2fb
blob + 5cc83c6ae12571a41866f719f2bcc779056930e0
--- 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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - dd887fb29c98441735f7b976f9525436b1fd60be
blob + 49d2a61c4646ba93878ace3fa6dea35ed02987e0
--- 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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 180f3808ba8401d4d361275429aa10a842cf8a75
blob + 34de6ab96ea0f3f69b3ecc4bbc9d6a651ae36e3c
--- got.1.html
+++ got.1.html
@@ -1630,7 +1630,7 @@
     </dl>
   </dd>
   <dt id="cy"><a class="permalink" href="#cherrypick"><code class="Cm" id="cherrypick">cherrypick</code></a>
-    <var class="Ar">commit</var></dt>
+    [<code class="Fl">-lX</code>] [<var class="Ar">commit</var>]</dt>
   <dd>
     <div class="Bd Bd-indent"><code class="Li">(alias:
       <code class="Cm">cy</code>)</code></div>
@@ -1678,16 +1678,55 @@
     <p class="Pp">The merged changes will appear as local changes in the work
         tree, which may be viewed with <code class="Cm">got diff</code>, amended
         manually or with further <code class="Cm">got cherrypick</code>
-        commands, committed with <code class="Cm">got commit</code>, or
-        discarded again with <code class="Cm">got revert</code>.</p>
+        commands, committed with <code class="Cm">got commit</code>.</p>
+    <p class="Pp">If invoked in a work tree where no
+        <code class="Cm">rebase</code>, <code class="Cm">histedit</code>, or
+        <code class="Cm">merge</code> operation is taking place,
+        <code class="Cm">got cherrypick</code> creates a record of commits which
+        have been merged into the work tree. When a file changed by
+        <code class="Cm">got cherrypick</code> is committed with
+        <code class="Cm">got commit</code>, the log messages of relevant merged
+        commits will then appear in the editor, where the messages must be
+        further adjusted to convey the reasons for cherrypicking the changes. If
+        all the changes in all files touched by a given commit are discarded,
+        e.g. with <code class="Cm">got revert</code>, this commit's log message
+        record will also disappear.</p>
     <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 any relevant files already
         contain merge conflicts, these conflicts must be resolved first.</p>
+    <p class="Pp">The options for <code class="Nm">got</code>
+        <code class="Cm">cherrypick</code> are as follows:</p>
+    <dl class="Bl-tag">
+      <dt id="l~7"><a class="permalink" href="#l~7"><code class="Fl">-l</code></a></dt>
+      <dd>Display a list of commit log messages recorded by cherrypick
+          operations, represented by references in the
+          &#x201C;refs/got/worktree&#x201D; reference namespace. If a
+          <var class="Ar">commit</var> is specified, only show the log message
+          of the specified commit.
+        <p class="Pp">If invoked in a work tree, only log messages recorded by
+            cherrypick operations in the current work tree will be displayed.
+            Otherwise, all commit log messages will be displayed irrespective of
+            the work tree in which they were created. This option cannot be used
+            with <code class="Fl">-X</code>.</p>
+      </dd>
+      <dt id="X~2"><a class="permalink" href="#X~2"><code class="Fl">-X</code></a></dt>
+      <dd>Delete log messages created by previous cherrypick operations,
+          represented by references in the &#x201C;refs/got/worktree&#x201D;
+          reference namespace. If a <var class="Ar">commit</var> is specified,
+          only delete the log message of the specified commit.
+        <p class="Pp">If invoked in a work tree, only log messages recorded by
+            cherrypick operations in the current work tree will be deleted.
+            Otherwise, all commit log messages will be deleted irrespective of
+            the work tree in which they were created. This option cannot be used
+            with <code class="Fl">-l</code>.</p>
+      </dd>
+    </dl>
+    <p class="Pp"></p>
   </dd>
   <dt id="bo"><a class="permalink" href="#backout"><code class="Cm" id="backout">backout</code></a>
-    <var class="Ar">commit</var></dt>
+    [<code class="Fl">-lX</code>] [<var class="Ar">commit</var>]</dt>
   <dd>
     <div class="Bd Bd-indent"><code class="Li">(alias:
       <code class="Cm">bo</code>)</code></div>
@@ -1736,13 +1775,51 @@
     <p class="Pp">The reverse-merged changes will appear as local changes in the
         work tree, which may be viewed with <code class="Cm">got diff</code>,
         amended manually or with further <code class="Cm">got backout</code>
-        commands, committed with <code class="Cm">got commit</code>, or
-        discarded again with <code class="Cm">got revert</code>.</p>
+        commands, committed with <code class="Cm">got commit</code>.</p>
+    <p class="Pp">If invoked in a work tree where no
+        <code class="Cm">rebase</code>, <code class="Cm">histedit</code>, or
+        <code class="Cm">merge</code> operation is taking place,
+        <code class="Cm">got backout</code> creates a record of commits which
+        have been reverse-merged into the work tree. When a file changed by
+        <code class="Cm">got backout</code> is committed with
+        <code class="Cm">got commit</code>, the log messages of relevant
+        reverse-merged commits will then appear in the editor, where the
+        messages must be further adjusted to convey the reasons for backing out
+        the changes. If all the changes in all files touched by a given commit
+        are discarded, e.g. with <code class="Cm">got revert</code>, this
+        commit's log message record will also disappear.</p>
     <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 any relevant files already
         contain merge conflicts, these conflicts must be resolved first.</p>
+    <p class="Pp">The options for <code class="Nm">got</code>
+        <code class="Cm">backout</code> are as follows:</p>
+    <dl class="Bl-tag">
+      <dt id="l~8"><a class="permalink" href="#l~8"><code class="Fl">-l</code></a></dt>
+      <dd>Display a list of commit log messages recorded by backout operations,
+          represented by references in the &#x201C;refs/got/worktree&#x201D;
+          reference namespace. If a <var class="Ar">commit</var> is specified,
+          only show the log message of the specified commit.
+        <p class="Pp">If invoked in a work tree, only log messages recorded by
+            backout operations in the current work tree will be displayed.
+            Otherwise, all commit log messages will be displayed irrespective of
+            the work tree in which they were created. This option cannot be used
+            with <code class="Fl">-X</code>.</p>
+      </dd>
+      <dt id="X~3"><a class="permalink" href="#X~3"><code class="Fl">-X</code></a></dt>
+      <dd>Delete log messages created by previous backout operations,
+          represented by references in the &#x201C;refs/got/worktree&#x201D;
+          reference namespace. If a <var class="Ar">commit</var> is specified,
+          only delete the log message of the specified commit.
+        <p class="Pp">If invoked in a work tree, only log messages recorded by
+            backout operations in the current work tree will be deleted.
+            Otherwise, all commit log messages will be deleted irrespective of
+            the work tree in which they were created. This option cannot be used
+            with <code class="Fl">-l</code>.</p>
+      </dd>
+    </dl>
+    <p class="Pp"></p>
   </dd>
   <dt id="rb"><a class="permalink" href="#rebase"><code class="Cm" id="rebase">rebase</code></a>
     [<code class="Fl">-aclX</code>] [<var class="Ar">branch</var>]</dt>
@@ -1870,7 +1947,7 @@
       <dt id="c~11"><a class="permalink" href="#c~11"><code class="Fl">-c</code></a></dt>
       <dd>Continue an interrupted rebase operation. If this option is used, no
           other command-line arguments are allowed.</dd>
-      <dt id="l~7"><a class="permalink" href="#l~7"><code class="Fl">-l</code></a></dt>
+      <dt id="l~9"><a class="permalink" href="#l~9"><code class="Fl">-l</code></a></dt>
       <dd>Show a list of past rebase operations, represented by references in
           the &#x201C;refs/got/backup/rebase&#x201D; reference namespace.
         <p class="Pp">Display the author, date, and log message of each backed
@@ -1889,7 +1966,7 @@
             does not require a work tree. None of the other options can be used
             together with <code class="Fl">-l</code>.</p>
       </dd>
-      <dt id="X~2"><a class="permalink" href="#X~2"><code class="Fl">-X</code></a></dt>
+      <dt id="X~4"><a class="permalink" href="#X~4"><code class="Fl">-X</code></a></dt>
       <dd>Delete backups created by past rebase operations, represented by
           references in the &#x201C;refs/got/backup/rebase&#x201D; reference
           namespace.
@@ -2093,7 +2170,7 @@
           them all into one commit. The <code class="Fl">-f</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>
-      <dt id="l~8"><a class="permalink" href="#l~8"><code class="Fl">-l</code></a></dt>
+      <dt id="l~10"><a class="permalink" href="#l~10"><code class="Fl">-l</code></a></dt>
       <dd>Show a list of past histedit operations, represented by references in
           the &#x201C;refs/got/backup/histedit&#x201D; reference namespace.
         <p class="Pp">Display the author, date, and log message of each backed
@@ -2118,7 +2195,7 @@
           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>
-      <dt id="X~3"><a class="permalink" href="#X~3"><code class="Fl">-X</code></a></dt>
+      <dt id="X~5"><a class="permalink" href="#X~5"><code class="Fl">-X</code></a></dt>
       <dd>Delete backups created by past histedit operations, represented by
           references in the &#x201C;refs/got/backup/histedit&#x201D; reference
           namespace.
@@ -2356,7 +2433,7 @@
           &#x201C;n&#x201D;, and &#x201C;q&#x201D; responses line-by-line from
           the specified <var class="Ar">response-script</var> file instead of
           prompting interactively.</dd>
-      <dt id="l~9"><a class="permalink" href="#l~9"><code class="Fl">-l</code></a></dt>
+      <dt id="l~11"><a class="permalink" href="#l~11"><code class="Fl">-l</code></a></dt>
       <dd>Instead of staging new changes, list paths which are already staged,
           along with the IDs of staged blob objects and stage status codes. If
           paths were provided on the command line, show the staged paths among
@@ -3052,7 +3129,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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - c9a30bb4674471bf7e78ed2d8c721d37607281e2
blob + ffd6008f70819ad7ea1c246f69109d1176bc6092
--- 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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - e036fa7866a0e2bb20f087d233b69098958d7ed5
blob + dc24400ff5e921ed1e2d319bf3e6809f32ba6506
--- gotadmin.1.html
+++ gotadmin.1.html
@@ -344,7 +344,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - ac69e67ee7435c42897371df18b25029d6c420dd
blob + 78495330bf7b43ea403d49791a9d5c506f485e0e
--- 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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 0c70de054cf9609a39d7cb8208920ee2156f422c
blob + bede3890b9c5ad4d8793b159d3481f6fcaf7bfcf
--- 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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - d8a333276e930754a3636c381eb35d2e37ea2ad1
blob + 6bbe55015fff76f658831e60552be68b6d813b68
--- gotd.conf.5.html
+++ gotd.conf.5.html
@@ -210,7 +210,7 @@ connection {
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 97bf5f602022a41ca7a20386d3aef7609ef201e6
blob + 9e12b8ee72caf39e2a11242ed0ad0c86f767ec82
--- gotsh.1.html
+++ gotsh.1.html
@@ -100,7 +100,7 @@
     protect the server machine and any systems reachable from it, especially if
     anonymous users are allowed to connect:</p>
 <div class="Bd Pp Bd-indent Li">
-<pre>Match User anonymous
+<pre>Match User developer
     DisableForwarding yes
     PermitTTY no</pre>
 </div>
@@ -112,6 +112,31 @@
     DisableForwarding yes
     PermitTTY no</pre>
 </div>
+<p class="Pp">Anonymous users can be given public read-only access by using a
+    <a class="Xr" aria-label="gotd.conf, section 5">gotd.conf(5)</a> access rule
+    such as the following:</p>
+<div class="Bd Pp Bd-indent Li">
+<pre>repository &quot;public&quot; {
+	path &quot;/var/git/public.git&quot;
+	permit ro anonymous
+}</pre>
+</div>
+<p class="Pp">The anonymous user account should have a publicly known password,
+    or can be set up with an empty password in which case the user's
+    <a class="Xr" aria-label="vipw, section 8">vipw(8)</a> entry would look
+    similar to this example:</p>
+<div class="Bd Pp Li">
+<pre>anonymous::1002:1002::0:0:Anonymous:/home/anonymous:/usr/local/bin/gotsh</pre>
+</div>
+<p class="Pp">Use of an empty password must be explicitly allowed in
+    <a class="Xr" aria-label="sshd_config, section 5">sshd_config(5)</a>:</p>
+<div class="Bd Pp Bd-indent Li">
+<pre>Match User anonymous
+    PasswordAuthentication yes
+    PermitEmptyPasswords yes
+    DisableForwarding yes
+    PermitTTY no</pre>
+</div>
 </section>
 <section class="Sh">
 <h2 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
@@ -129,7 +154,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - a823fa2ee409dc15527cd98725759bfa8014278f
blob + fddfb5664ba51a629e3b28d5552540538c8016c4
--- gotwebd.8.html
+++ gotwebd.8.html
@@ -169,7 +169,7 @@
 <p class="Pp"><a class="Xr" aria-label="got, section 1">got(1)</a>,
     <a class="Xr" aria-label="git-repository, section 5">git-repository(5)</a>,
     <a class="Xr" aria-label="gotwebd.conf, section 5">gotwebd.conf(5)</a>,
-    <a class="Xr" aria-label="http.conf, section 5">http.conf(5)</a>,
+    <a class="Xr" aria-label="httpd.conf, section 5">httpd.conf(5)</a>,
     <a class="Xr" aria-label="httpd, section 8">httpd(8)</a></p>
 </section>
 <section class="Sh">
@@ -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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - ce4c2ba9bc27449070928e306dc600b62edd9bf3
blob + 5e8f92306d2e6814cc106f27605b154fbcf18aeb
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
@@ -253,7 +253,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">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - c850eb231deac8f42e22ad18d28ace39b3ef3189
blob + f883bbb469fdd54993e2d1fb01485fcef20977e0
--- tog.1.html
+++ tog.1.html
@@ -797,7 +797,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">January 23,
+  line"><span class="foot-left"></span><span class="foot-date">January 30,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>