commit e68eaba8dba7363e91439878102371e52228c91b
from: Stefan Sperling <stsp@stsp.name>
date: Thu Apr 20 15:55:08 2023 UTC

sync man pages

commit - 47975f11e5334a764d15e2d4fde9f2b90f5eb43e
commit + e68eaba8dba7363e91439878102371e52228c91b
blob - 68f744ed96e63750c1976a934b6cd627ef237068
blob + 061452c49413ab9cfedd09e69736020d98906165
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 9cd858f6064d230ceea256296861327b5c4171a3
blob + a2ec94a3c03a28aba03a89688dcf185681678615
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 805201f6d37c60bc6304f3991f62f68969a87a69
blob + 56e58272362d6539ea2dbb9f0bbbbb3c57429af0
--- got.1.html
+++ got.1.html
@@ -2398,9 +2398,6 @@
         the merge can be continued once the changes present in the work tree are
         considered complete. Alternatively, the merge operation may be aborted
         which will leave the work tree's current branch unmodified.</p>
-    <p class="Pp">If a merge conflict is resolved in a way which renders all
-        merged changes into no-op changes, the merge operation cannot continue
-        and must be aborted.</p>
     <p class="Pp"><code class="Cm">got merge</code> will refuse to run if
         certain preconditions are not met. If history of the
         <var class="Ar">branch</var> is based on the work tree's current branch,
@@ -3036,7 +3033,16 @@ remote &quot;origin&quot; {
   origin/master</code></div>
 <div class="Bd Bd-indent"><code class="Li">$ got histedit -f</code></div>
 <div class="Bd Bd-indent"><code class="Li">$ got send -f -b master
+  origin</code></div>
+<p class="Pp">In addition to reviewing the pull request in the web user
+    interface, Jelmer can fetch the pull request's branch into his local
+    repository and create a local branch which contains the proposed
+  changes:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got fetch -R refs/pull/1046/head
   origin</code></div>
+<div class="Bd Bd-indent"><code class="Li">$ got branch -c
+  refs/remotes/origin/pull/1046/head pr1046</code></div>
 <p class="Pp">Once Jelmer has accepted the pull request, Stefan can fetch the
     merged changes, and possibly several other new changes, by running:</p>
 <p class="Pp"></p>
@@ -3193,7 +3199,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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 08ceea0979a34379b324b6c7fe0f588e73c1ffda
blob + b6d506d780bf8f4d38c4b317bc6e1d1d211437dd
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - cb7829f57d447f6feff3d1c0f40871a91d55a681
blob + bac78212418b05c1aace7e3e15d9537a1cb05fb6
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - d13829f2719e6433e13c6f6e0b12250919e9004e
blob + 7c767e10680d0f18e93a4bf741d3cbfd9b267825
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - abb355283921f523914ab4420bfd90e3ee3e49be
blob + 8e178b0ed8f54f1f9b7f5274dd6a6251fbf37ed8
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 31b22d7e76aabe6d0d438bb33477bbd72a0e5187
blob + fc4a67ffe701f1b57fab426d170f7c0ee409140d
--- gotd.conf.5.html
+++ gotd.conf.5.html
@@ -156,6 +156,53 @@
       <code class="Ic">rw</code> for read-write access. Group names may be
       matched by prepending a colon (&#x2018;:&#x2019;) to
       <var class="Ar">identity</var>. Numeric IDs are also accepted.</dd>
+  <dt id="protect"><a class="permalink" href="#protect"><code class="Ic">protect</code></a>
+    {<var class="Ar">...</var>}</dt>
+  <dd>The <code class="Cm">protect</code> directive may be used to protect
+      branches and tags in a repository from being overwritten by potentially
+      destructive client-side commands, such as when <code class="Cm">got send
+      -f</code> and <code class="Cm">git push -f</code> are used to change the
+      history of a branch.
+    <p class="Pp">To build a set of protected branches and tags, multiple
+        <code class="Ic">protect</code> directives may be specified per
+        repository and multiple <code class="Ic">protect</code> directive
+        parameters may be specified within curly braces.</p>
+    <p class="Pp">The available <code class="Cm">protect</code> parameters are
+        as follows:</p>
+    <dl class="Bl-tag">
+      <dt id="branch"><a class="permalink" href="#branch"><code class="Ic">branch</code></a>
+        <var class="Ar">name</var></dt>
+      <dd>Protect the named branch. The branch may be created if it does not
+          exist yet. Attempts to delete the branch or change its history will be
+          denied.
+        <p class="Pp">If the <var class="Ar">name</var> does not already begin
+            with &#x201C;refs/heads/&#x201D; it will be looked up in the
+            &#x201C;refs/heads/&#x201D; reference namespace.</p>
+      </dd>
+      <dt id="branch~2"><a class="permalink" href="#branch~2"><code class="Ic">branch</code></a>
+        <code class="Ic">namespace</code> <var class="Ar">namespace</var></dt>
+      <dd>Protect the given reference namespace, assuming that references in
+          this namespace represent branches. New branches may be created in the
+          namespace. Attempts to change the history of branches or delete them
+          will be denied.
+        <p class="Pp">The <var class="Ar">namespace</var> argument must be
+            absolute, starting with &#x201C;refs/&#x201D;.</p>
+      </dd>
+      <dt id="tag"><a class="permalink" href="#tag"><code class="Ic">tag</code></a>
+        <code class="Ic">namespace</code> <var class="Ar">namespace</var></dt>
+      <dd>Protect the given reference namespace, assuming that references in
+          this namespace represent tags. New tags may be created in the
+          namespace. Attempts to change or delete existing tags will be denied.
+        <p class="Pp">The <var class="Ar">namespace</var> argument must be
+            absolute, starting with &#x201C;refs/&#x201D;.</p>
+      </dd>
+    </dl>
+    <p class="Pp">The special reference namespaces &#x201C;refs/got/&#x201D; and
+        &#x201C;refs/remotes/&#x201D; do not need to be listed in
+        <code class="Nm">gotd.conf</code>. These namespaces are always protected
+        and even attempts to create new references in these namespaces will
+        always be denied.</p>
+  </dd>
 </dl>
 </section>
 <section class="Sh">
@@ -180,6 +227,9 @@ repository &quot;src&quot; {
 	permit rw flan_hacker
 	permit rw :developers
 	permit ro anonymous
+
+	protect branch &quot;main&quot;
+	protect tag namespace &quot;refs/tags/&quot;
 }
 
 # This repository can be accessed via
@@ -189,6 +239,11 @@ repository &quot;openbsd/ports&quot; {
 	permit rw :porters
 	permit ro anonymous
 	deny flan_hacker
+
+	protect {
+		branch &quot;main&quot;
+		tag namespace &quot;refs/tags/&quot;
+	}
 }
 
 # Use a larger request timeout value:
@@ -210,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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 88cbe0ec3d375b49ba34e7332ad8b3815e202f10
blob + b7eab92c9d525fcc5925ba39b5293a06faa9ea4f
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - 014ccaf33a00b34e6ceca7b24a1be9fa9f7227b3
blob + 0fea03d949c3651814c54c6ada07ea30540705df
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - c7205a5f0cba57a979a9c9673ef3c80432066d84
blob + f936c4b19d2a0e66c12770857986598c4cb88747
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>
blob - db4428745a76ba1f2d69ea83ee5120d8c04dca4f
blob + 312215a030e63d0a751722f141b12888b242c47a
--- 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">March 12,
-  2023</span> <span class="foot-os">OpenBSD 7.2</span></div>
+  line"><span class="foot-left"></span><span class="foot-date">April 19,
+  2023</span> <span class="foot-os">OpenBSD 7.3</span></div>
 </body>
 </html>