commit 297acb866a7d6429b4076791ce38c58d0031b922
from: Stefan Sperling <stsp@stsp.name>
date: Tue Mar 07 18:53:44 2023 UTC

sync man pages

commit - e5d45f850cadf46fd29938f0e1892030f1b7a360
commit + 297acb866a7d6429b4076791ce38c58d0031b922
blob - 640327e8962a1f692f194a6ea067173e85cb9df8
blob + e2f56b67bb5606b154d8f9f90b5e365e83957b92
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 46fa54b327aae922b11dc47db9a32640e51bcfbb
blob + 3f32706b2a3cc6b56769d2a6bbb8fa142ab2a304
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 81e7d513182bb0cd08c1318bd9481e601c1bc28b
blob + d3de95f732afa24b42e70c4766dfc96a46874974
--- got.1.html
+++ got.1.html
@@ -2049,7 +2049,8 @@
     <p class="Pp">Editing of commit history is controlled via a
         <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">-f</code> or <code class="Fl">-m</code> options.</p>
+        <code class="Fl">-d</code>, <code class="Fl">-e</code>,
+        <code class="Fl">-f</code>, or <code class="Fl">-m</code> options.</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
@@ -2065,8 +2066,20 @@
       <tr id="edit">
         <td><a class="permalink" href="#edit"><code class="Cm">edit</code></a>
           <var class="Ar">commit</var></td>
-        <td>Use the specified commit but once changes have been merged into the
-          work tree interrupt the histedit operation for amending.</td>
+        <td>Apply the changes from the specified commit, but then interrupt the
+          histedit operation for amending, without creating a commit. While the
+          histedit operation is interrupted arbitrary files may be edited, and
+          commands which manipulate the work tree can be used freely. The
+          <code class="Cm">got add</code> and <code class="Cm">got remove</code>
+          commands can be used to add new files or remove existing ones. The
+          <code class="Cm">got revert -p</code> command can be used to eliminate
+          arbitrary changes from files in the work tree. The
+          <code class="Cm">got stage -p</code> command may be used to prepare a
+          subset of changes for inclusion in the next commit. Finally, the
+          <code class="Cm">got commit</code> command can be used to insert
+          arbitrary commits into the edited history. Regular editing of history
+          must eventually be resumed by running <code class="Cm">got histedit
+          -c</code>.</td>
       </tr>
       <tr id="fold">
         <td><a class="permalink" href="#fold"><code class="Cm">fold</code></a>
@@ -2672,9 +2685,8 @@
   <dd>The editor spawned by <code class="Cm">got commit</code>,
       <code class="Cm">got histedit</code>, <code class="Cm">got import</code>,
       or <code class="Cm">got tag</code>. If not set, the
-      <a class="Xr" aria-label="ed, section 1">ed(1)</a> text editor will be
-      spawned in order to give <a class="Xr" aria-label="ed, section
-      1">ed(1)</a> the attention it deserves.</dd>
+      <a class="Xr" aria-label="vi, section 1">vi(1)</a> text editor will be
+      spawned.</dd>
 </dl>
 </section>
 <section class="Sh">
@@ -3177,7 +3189,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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 8a488b05f6db07bde29719ef01c56e2b4b354a0b
blob + 326a8ed5c5a6662eb6e37337699408efeeba975e
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - fa40177ea1446e8d5d2ebb933184ba3e46a8a124
blob + 150d855224195a1a25632062fb569996bb1e6cf2
--- gotadmin.1.html
+++ gotadmin.1.html
@@ -348,7 +348,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 8c10bb407dd68cc27348b96df3ba8a2b5e2e4a18
blob + 41dc5ba7d5568349165a1bd6d8f073056a541842
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - c62308ff458c495109093148bb88cb89d8922bbc
blob + 3252e17fbb49da8a51ef85632bf8975544442f04
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 1a1dc512af9a0c947a16dbed02212ef865c08b0a
blob + 041b5e57e8e6587f460db58d048a91a44eab4d95
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 24fca51cbd0740bf8be81e846d23008b41f07c7b
blob + 29b2a9d4a7ed114898d711e9b1fba3605d40988d
--- gotsh.1.html
+++ gotsh.1.html
@@ -154,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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - adbe9fd5e421d817bb8a4b5fd737fd68e769263f
blob + d12fbfa05024ddde868051903a4338ae46fce35c
--- 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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - 9dfb77ada555b6385766a0ef1c7a754ee9372ef1
blob + d7beae4bbe7ed7e9879917b5d37f8137ad3627fa
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
@@ -252,7 +252,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">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>
blob - afec55464ebcaa00a7dac4aa3b73d6fd10515150
blob + 6a20476627971e1548a849990cd44cf4a39ab124
--- tog.1.html
+++ tog.1.html
@@ -769,7 +769,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">February 22,
+  line"><span class="foot-left"></span><span class="foot-date">March 7,
   2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
 </body>
 </html>