Commit Diff


commit - 1044972a376a2822efa4791dbd55a597c68c217c
commit + dfc34448445f311e65bbacebf55a6fedb862a400
blob - 748836b22229c138b54386f342915d2fbbf72a9c
blob + 7976c47b337591a6528f7c5612d4cf8713310d00
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 82452f07891253bdba9953ee86ec1838003d2cdb
blob + 15d5badc1b031fcc097dfc1fc0713442e6f3b570
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 9f112b2eef1ea7fb9612b912eb4072238b3c3435
blob + c7720b248733e2cc40b2dfb58b34f75185aecc65
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 1f30ef1e080b44cab9ef78f963a4c616df9a6f75
blob + d4ce07d75dc6d88f2b3be20e83044d8592325557
--- got.1.html
+++ got.1.html
@@ -161,8 +161,8 @@
         <p class="Pp">The &#x201C;smart&#x201D; Git HTTP protocol is supported
             by <code class="Cm">got clone</code> and <code class="Cm">got
             fetch</code>, but not by <code class="Cm">got send</code>. Sending
-            from a repository cloned over HTTP will require use of the
-            <code class="Ic">send</code> directive in
+            from a repository cloned over HTTP will require use of a
+            <code class="Ic">send</code> block in
             <a class="Xr" aria-label="got.conf, section 5">got.conf(5)</a> to
             ensure that the &#x201C;ssh://&#x201D; protocol will be used by
             <code class="Cm">got send</code>.</p>
@@ -2722,7 +2722,7 @@
     </dl>
   </dd>
   <dt id="sg"><a class="permalink" href="#stage"><code class="Cm" id="stage">stage</code></a>
-    [<code class="Fl">-lpRS</code>] [<code class="Fl">-F</code>
+    [<code class="Fl">-lpS</code>] [<code class="Fl">-F</code>
     <var class="Ar">response-script</var>] [<var class="Ar">path ...</var>]</dt>
   <dd>
     <div class="Bd Bd-indent"><code class="Li">(alias:
@@ -2786,10 +2786,6 @@
           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 id="R~9"><a class="permalink" href="#R~9"><code class="Fl">-R</code></a></dt>
-      <dd>Permit recursion into directories. If this option is not specified,
-          <code class="Cm">got stage</code> will refuse to run if a specified
-          <var class="Ar">path</var> is a directory.</dd>
       <dt id="S~4"><a class="permalink" href="#S~4"><code class="Fl">-S</code></a></dt>
       <dd>Allow staging of symbolic links which point outside of the path space
           that is under version control. By default, <code class="Cm">got
@@ -2818,7 +2814,7 @@
         necessary.</p>
   </dd>
   <dt id="ug"><a class="permalink" href="#unstage"><code class="Cm" id="unstage">unstage</code></a>
-    [<code class="Fl">-pR</code>] [<code class="Fl">-F</code>
+    [<code class="Fl">-p</code>] [<code class="Fl">-F</code>
     <var class="Ar">response-script</var>] [<var class="Ar">path ...</var>]</dt>
   <dd>
     <div class="Bd Bd-indent"><code class="Li">(alias:
@@ -2872,10 +2868,6 @@
           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 id="R~10"><a class="permalink" href="#R~10"><code class="Fl">-R</code></a></dt>
-      <dd>Permit recursion into directories. If this option is not specified,
-          <code class="Cm">got unstage</code> will refuse to run if a specified
-          <var class="Ar">path</var> is a directory.</dd>
     </dl>
   </dd>
   <dt id="cat"><a class="permalink" href="#cat"><code class="Cm">cat</code></a>
@@ -3132,6 +3124,15 @@
   sys/uvm/uvm_ubc.c</code></div>
 <div class="Bd Bd-indent"><code class="Li">$ got remove
   sys/uvm/uvm_vnode.c</code></div>
+<p class="Pp">A file can be renamed or moved by removing it from its old
+    location and adding it at the new location:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ cp oldfile.c newfile.c</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got remove oldfile.c</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got add newfile.c</code></div>
+<p class="Pp"><code class="Nm">got</code> does not yet follow file history
+    across renames, but <a class="Xr" aria-label="git, section 1">git(1)</a>
+    will be able to do so regardless.</p>
 <p class="Pp">Create a new commit from local changes in a work tree directory
     with a pre-defined log message.</p>
 <p class="Pp"></p>
@@ -3508,7 +3509,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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 1917a233a6eb9eee6d95a52e39bfc9f9c1e693e3
blob + cb3bbe9a76b1b1a2a3847ef121bb202dafd63746
--- got.conf.5.html
+++ got.conf.5.html
@@ -125,14 +125,28 @@
               <a class="Xr" aria-label="git-daemon, section 1">git-daemon(1)</a>
               server. Use of this protocol is discouraged since it supports
               neither authentication nor encryption.</dd>
-          <dt>git+ssh</dt>
+          <dt>ssh</dt>
           <dd>The Git protocol wrapped in an authenticated and encrypted
               <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> tunnel. With
               this protocol the hostname may contain an embedded username for
               <a class="Xr" aria-label="ssh, section 1">ssh(1)</a> to use:
               <a class="Mt" href="mailto:user@hostname">user@hostname</a></dd>
-          <dt>ssh</dt>
-          <dd>Short alias for git+ssh.</dd>
+          <dt>http</dt>
+          <dd>The &#x201C;smart&#x201D; Git HTTP protocol. Not compatible with
+              servers using the &#x201C;dumb&#x201D; Git HTTP protocol.
+            <p class="Pp">The &#x201C;smart&#x201D; Git HTTP protocol is
+                supported by <code class="Cm">got clone</code> and
+                <code class="Cm">got fetch</code>, but not by
+                <code class="Cm">got send</code>. To send from a repository
+                cloned over HTTP, add a <code class="Ic">send</code> block (see
+                below) to ensure that the &#x201C;ssh://&#x201D; protocol will
+                be used by <code class="Cm">got send</code>.</p>
+            <p class="Pp">Use of this protocol is discouraged since it supports
+                neither authentication nor encryption.</p>
+          </dd>
+          <dt>https</dt>
+          <dd>The &#x201C;smart&#x201D; Git HTTP protocol wrapped in
+            SSL/TLS.</dd>
         </dl>
       </dd>
       <dt id="port"><a class="permalink" href="#port"><code class="Ic">port</code></a>
@@ -257,8 +271,8 @@
   repository:</p>
 <div class="Bd Pp Bd-indent Li">
 <pre>remote &quot;origin&quot; {
-	server git.gameoftrees.org
-	protocol git
+	server anonymous@got.gameoftrees.org
+	protocol ssh
 	repository got
 	branch { &quot;main&quot; }
 }</pre>
@@ -306,7 +320,7 @@
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 3908702f5fa21b3db0aaa5e2411ce87751245062
blob + b42ff8aa59d400d3502ad9433b7263890ec0c355
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - dd544668c4959201fb0376ff2340a043b005e0d9
blob + a7a957740ed2061bc8972effde4a42d20021334a
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 934c1d4fe17f4b57a6e53a0d6b195b06cb45a367
blob + 23055ac120108fd294c7f3473d3c71683ec3c1ec
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 10d040b23b01c6dd5e2dbd9b635a4689c9b3f97a
blob + 5c46d031257966a5ab587692aa730a16f71dc2f9
--- gotd.conf.5.html
+++ gotd.conf.5.html
@@ -291,10 +291,21 @@
             credentials.</p>
         <p class="Pp">The request body contains a JSON object with a
             &#x201C;notifications&#x201D; property containing an array of
-            notification objects. Each notification object has a
-            &#x2018;type&#x2019; property. Depending on the type, each
-            notification object has different fields. The types are:</p>
+            notification objects. The following notification object properties
+            are always present:</p>
         <dl class="Bl-tag">
+          <dt id="repo"><a class="permalink" href="#repo"><code class="Dv">repo</code></a></dt>
+          <dd>The repository name as a string.</dd>
+          <dt id="authenticated_user"><a class="permalink" href="#authenticated_user"><code class="Dv">authenticated_user</code></a></dt>
+          <dd>The committer's user account as authenticated by
+              <a class="Xr" aria-label="gotd, section 8">gotd(8)</a> as a
+              string.</dd>
+          <dt id="type"><a class="permalink" href="#type"><code class="Dv">type</code></a></dt>
+          <dd>The notification object type as a string.</dd>
+        </dl>
+        <p class="Pp">Each notification object carries additional type-specific
+            properties. The types and their type-specific properties are:</p>
+        <dl class="Bl-tag">
           <dt id="commit"><a class="permalink" href="#commit"><code class="Dv">commit</code></a></dt>
           <dd>The commit notification object has the following fields. Except
               where noted, all are optional.
@@ -304,8 +315,6 @@
                   When several commits are batched in a single send operation,
                   not all of the fields are available for each commit
                 object.</dd>
-              <dt id="repo"><a class="permalink" href="#repo"><code class="Dv">repo</code></a></dt>
-              <dd>The repository name as string.</dd>
               <dt id="id"><a class="permalink" href="#id"><code class="Dv">id</code></a></dt>
               <dd>The commit ID as string, may be abbreviated.</dd>
               <dt id="committer"><a class="permalink" href="#committer"><code class="Dv">committer</code></a></dt>
@@ -326,7 +335,7 @@
               </dd>
               <dt id="author"><a class="permalink" href="#author"><code class="Dv">author</code></a></dt>
               <dd>An object with the author information. Has the same fields as
-                  the <code class="Dv">committer</code> but may be unset.</dd>
+                  the &#x2018;committer&#x2019; but may be unset.</dd>
               <dt id="date"><a class="permalink" href="#date"><code class="Dv">date</code></a></dt>
               <dd>Number, representing the number of seconds since the Epoch in
                   UTC.</dd>
@@ -337,10 +346,10 @@
               <dd>The complete commit message, may be unset.</dd>
               <dt id="diffstat"><a class="permalink" href="#diffstat"><code class="Dv">diffstat</code></a></dt>
               <dd>An object with the summarized changes, may be unset. Contains
-                  a <code class="Dv">files</code> field with an array of objects
-                  describing the changes per-file and a
-                  <code class="Dv">total</code> field with the cumulative
-                  changes. The changes per-file contains the following fields:
+                  a &#x2018;files&#x2019; field with an array of objects
+                  describing the changes per-file and a &#x2018;total&#x2019;
+                  field with the cumulative changes. The changes per-file
+                  contains the following fields:
                 <p class="Pp"></p>
                 <dl class="Bl-tag Bl-compact">
                   <dt id="action"><a class="permalink" href="#action"><code class="Dv">action</code></a></dt>
@@ -355,19 +364,17 @@
                   <dt id="removed"><a class="permalink" href="#removed"><code class="Dv">removed</code></a></dt>
                   <dd>The number of lines removed.</dd>
                 </dl>
-                <p class="Pp">The <code class="Dv">total</code> object contains
-                    two fields: <code class="Dv">added</code> and
-                    <code class="Dv">removed</code> which are the number of
-                    added and removed lines respectively.</p>
+                <p class="Pp">The &#x2018;total&#x2019; object contains two
+                    fields: &#x2018;added&#x2019; and &#x2018;removed&#x2019;
+                    which are the number of added and removed lines
+                    respectively.</p>
               </dd>
             </dl>
           </dd>
           <dt id="branch-deleted"><a class="permalink" href="#branch-deleted"><code class="Dv">branch-deleted</code></a></dt>
           <dd>The branch deleted notifications has the following fields, all
               guaranteed to be set:
-            <dl class="Bl-tag Bl-compact">
-              <dt id="repo~2"><a class="permalink" href="#repo~2"><code class="Dv">repo</code></a></dt>
-              <dd>The repository name as string.</dd>
+            <dl class="Bl-tag">
               <dt id="ref"><a class="permalink" href="#ref"><code class="Dv">ref</code></a></dt>
               <dd>The removed branch reference.</dd>
               <dt id="id~2"><a class="permalink" href="#id~2"><code class="Dv">id</code></a></dt>
@@ -378,23 +385,19 @@
           <dd>The tag notification has the following fields, all guaranteed to
               be set:
             <dl class="Bl-tag">
-              <dt>repo</dt>
-              <dd>The repository name as string.</dd>
               <dt>tag</dt>
               <dd>The tag reference.</dd>
               <dt>tagger</dt>
               <dd>The user information, with the same format of the
-                  <code class="Dv">committer</code> field for the
-                  <code class="Dv">commit</code> notification but with all the
-                  field guaranteed to be set.</dd>
+                  &#x2018;committer&#x2019; field for the &#x2018;commit&#x2019;
+                  notification but with all the field guaranteed to be set.</dd>
               <dt id="date~2"><a class="permalink" href="#date~2"><code class="Dv">date</code></a></dt>
               <dd>Number, representing the number of seconds since the Epoch in
                   UTC.</dd>
               <dt id="object"><a class="permalink" href="#object"><code class="Dv">object</code></a></dt>
               <dd>The object being tagged. It contains the fields
-                  <code class="Dv">type</code> with the object type and
-                  <code class="Dv">id</code> with the object id being
-                tagged.</dd>
+                  &#x2018;type&#x2019; with the object type and
+                  &#x2018;id&#x2019; with the object id being tagged.</dd>
               <dt id="message~2"><a class="permalink" href="#message~2"><code class="Dv">message</code></a></dt>
               <dd>The tag message.</dd>
             </dl>
@@ -471,7 +474,7 @@ connection {
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 2f8b5bbb49b15a58dc48a06aeea02fd1de696423
blob + cc433ea0aa641f9a2aa00e604cee893480d558d7
--- 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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 1b034f69fee6aabb1422cfab705d85302fdfd278
blob + 67e752267bdc6f69fa849f36c9a863d258f230c2
--- gotwebd.8.html
+++ gotwebd.8.html
@@ -188,7 +188,7 @@ server &quot;example.com&quot; {
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - bf258f30500ae7840e0c6f063860270ffda2ef16
blob + df1924790c646b4691bc170c03bf5e2680d62447
--- gotwebd.conf.5.html
+++ gotwebd.conf.5.html
@@ -236,7 +236,7 @@ owner = &quot;Your Name&quot;</pre>
 </section>
 </main>
 <div class="foot" role="doc-pagefooter" aria-label="Manual footer
-  line"><span class="foot-left"></span><span class="foot-date">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>
blob - 91892d4bca9fd1e8c531c15615c5dddbea0b5a34
blob + 7a12c169c9a8f169919305485dcdf488e9b240fc
--- tog.1.html
+++ tog.1.html
@@ -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">April 23,
+  line"><span class="foot-left"></span><span class="foot-date">May 6,
   2024</span> <span class="foot-os">OpenBSD 7.5</span></div>
 </body>
 </html>