commit 91b3da3f7b9f268cef0228f185c163f0d7490b70
from: Stefan Sperling <stsp@stsp.name>
date: Sun Aug 18 17:06:04 2019 UTC

sync man pages

commit - 30d50d221eb45d1ec81aa9dfc1a9d2a233493e96
commit + 91b3da3f7b9f268cef0228f185c163f0d7490b70
blob - 2d516ebda4548224540c1fc770328119063ede54
blob + 0e8394b9eed3ab2bfbcb700ffadd52ab470b7858
--- git-repository.5.html
+++ git-repository.5.html
@@ -197,14 +197,14 @@ The Git repository format was initially designed by Li
 The particular set of disallowed characters in reference names is a consequence
   of design choices made for the command-line interface of
   <a class="Xr">git(1)</a>. The same characters are disallowed by Got for
-  compatibility purposes. Got additionaly prevents users from creating reference
-  names with a leading - (dash) character, because this is rarely intended and
-  not considered useful.
+  compatibility purposes. Got additionally prevents users from creating
+  reference names with a leading - (dash) character, because this is rarely
+  intended and not considered useful.
 </section>
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 13, 2019</td>
+    <td class="foot-date">August 18, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - 542e324d82bb155974ea8e2dc7fe0f31eb5cff84
blob + 0d40608b27035511e57f1d0217b6d0dbd248360e
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -174,7 +174,7 @@ A Got <i class="Em">work tree</i> stores a file hierar
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 13, 2019</td>
+    <td class="foot-date">August 18, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - 46b0dce9f1951214271e64007ca5cac33370f100
blob + 565e5a1f6c1ad67800debb217f77b536e5447971
--- got.1.html
+++ got.1.html
@@ -72,7 +72,7 @@
     the filesystem hierarchy. The on-disk format of this work tree is described
     in <a class="Xr">got-worktree(5)</a>.</p>
 <p class="Pp"><code class="Nm">got</code> provides global and command-specific
-    options. Global options must preceed the command name, and are as
+    options. Global options must precede the command name, and are as
   follows:</p>
 <dl class="Bl-tag">
   <dt><a class="permalink" href="#h"><code class="Fl" id="h">-h</code></a></dt>
@@ -221,7 +221,7 @@
         <code class="Fl">-b</code> option.</p>
     <p class="Pp"><code class="Cm">got update</code> cannot update paths with
         staged changes. If changes have been staged with <code class="Cm">got
-        stage</code>, these changes must first be comitted with
+        stage</code>, these changes must first be committed with
         <code class="Cm">got commit</code> or unstaged with <code class="Cm">got
         unstage</code>.</p>
     <p class="Pp">The options for <code class="Cm">got update</code> are as
@@ -355,7 +355,11 @@
           which originated on other branches will be omitted.</dd>
       <dt><a class="permalink" href="#l"><code class="Fl" id="l">-l</code></a>
         <var class="Ar">N</var></dt>
-      <dd>Limit history traversal to a given number of commits.</dd>
+      <dd>Limit history traversal to a given number of commits. If this option
+          is not specified, a default limit value of zero is used, which is
+          treated as an unbounded limit. The
+          <code class="Ev">GOT_LOG_DEFAULT_LIMIT</code> environment variable may
+          be set to change this default value.</dd>
       <dt><a class="permalink" href="#p_2"><code class="Fl" id="p_2">-p</code></a></dt>
       <dd>Display the patch of modifications made in each commit.</dd>
       <dt><a class="permalink" href="#r_2"><code class="Fl" id="r_2">-r</code></a>
@@ -584,7 +588,7 @@
     [<code class="Fl">-p</code>] [<code class="Fl">-F</code>
     <var class="Ar">response-script</var>] [<code class="Fl">-R</code>]
     <var class="Ar">path ...</var></dt>
-  <dd>Revert any uncommited changes in files at the specified paths. File
+  <dd>Revert any uncommitted changes in files at the specified paths. File
       contents will be overwritten with those contained in the work tree's base
       commit. There is no way to bring discarded changes back after
       <code class="Cm">got revert</code>!
@@ -713,9 +717,9 @@
     </table>
     <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> comands,
-        committed with <code class="Cm">got commit</code>, or discarded again
-        with <code class="Cm">got revert</code>.</p>
+        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>
     <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
@@ -767,8 +771,8 @@
     <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>
-        comands, 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>, or
+        discarded again with <code class="Cm">got revert</code>.</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
@@ -783,7 +787,7 @@
   <dd>Rebase commits on the specified <var class="Ar">branch</var> onto the tip
       of the current branch of the work tree. The <var class="Ar">branch</var>
       must share common ancestry with the work tree's current branch. Rebasing
-      begins with the first descendent commit of the youngest common ancestor
+      begins with the first descendant commit of the youngest common ancestor
       commit shared by the specified <var class="Ar">branch</var> and the work
       tree's current branch, and stops once the tip commit of the specified
       <var class="Ar">branch</var> has been rebased.
@@ -839,7 +843,7 @@
         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 changes have been staged with
-        <code class="Cm">got stage</code>, these changes must first be comitted
+        <code class="Cm">got stage</code>, these changes must first be committed
         with <code class="Cm">got commit</code> or unstaged with
         <code class="Cm">got unstage</code>. If the work tree contains local
         changes, these changes must first be committed with <code class="Cm">got
@@ -957,7 +961,7 @@
         of the branch may not be edited. 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 changes have been staged with
-        <code class="Cm">got stage</code>, these changes must first be comitted
+        <code class="Cm">got stage</code>, these changes must first be committed
         with <code class="Cm">got commit</code> or unstaged with
         <code class="Cm">got unstage</code>. If the work tree contains local
         changes, these changes must first be committed with <code class="Cm">got
@@ -1137,6 +1141,11 @@
   <dt><a class="permalink" href="#VISUAL"><code class="Ev" id="VISUAL">VISUAL</code></a>,
     <code class="Ev">EDITOR</code></dt>
   <dd>The editor spawned by <code class="Cm">got commit</code>.</dd>
+  <dt><a class="permalink" href="#GOT_LOG_DEFAULT_LIMIT"><code class="Ev" id="GOT_LOG_DEFAULT_LIMIT">GOT_LOG_DEFAULT_LIMIT</code></a></dt>
+  <dd>The default limit on the number of commits traversed by
+      <code class="Cm">got log</code>. If set to zero, the limit is unbounded.
+      This variable will be silently ignored if it is set to a non-numeric
+      value.</dd>
 </dl>
 </section>
 <section class="Sh">
@@ -1314,7 +1323,7 @@ Clone an existing Git repository for use with <code cl
 <span class="An">Martin Pieuchot</span>
   &lt;<a class="Mt" href="mailto:mpi@openbsd.org">mpi@openbsd.org</a>&gt;
 <br/>
-<span class="An">joshua stein</span>
+<span class="An">Joshua Stein</span>
   &lt;<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>&gt;
 </section>
 <section class="Sh">
@@ -1327,7 +1336,7 @@ Clone an existing Git repository for use with <code cl
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 13, 2019</td>
+    <td class="foot-date">August 18, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - d333957edf721eea62fc6dfafdf93e371aad79a6
blob + d1aa49ad661721837c636c500da417eb77ea35c8
--- tog.1.html
+++ tog.1.html
@@ -343,13 +343,13 @@ The <code class="Nm">tog</code> utility exits&#x00A0;0
 <span class="An">Stefan Sperling</span>
   &lt;<a class="Mt" href="mailto:stsp@openbsd.org">stsp@openbsd.org</a>&gt;
 <br/>
-<span class="An">joshua stein</span>
+<span class="An">Joshua Stein</span>
   &lt;<a class="Mt" href="mailto:jcs@openbsd.org">jcs@openbsd.org</a>&gt;
 </section>
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 13, 2019</td>
+    <td class="foot-date">August 18, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>