commit c2a52be55ae480322872a422de5f90d5a65f2957
from: Stefan Sperling <stsp@stsp.name>
date: Sun Sep 08 17:16:56 2019 UTC

sync man pages

commit - a22a0a702786f9543ecdc054933237bea478b344
commit + c2a52be55ae480322872a422de5f90d5a65f2957
blob - 82e8fe0bd5e92e5cc4c3d8ca79076684e2ac5585
blob + 710345416ddf577ab77206cfa767767949cc4bfb
--- git-repository.5.html
+++ git-repository.5.html
@@ -208,7 +208,7 @@ The particular set of disallowed characters in referen
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 26, 2019</td>
+    <td class="foot-date">September 8, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - bbcbf3ff39dddd0dd81e3b8e07826d3bf36225c8
blob + f489a9ac44755b82f05ccf2473e582b131b849fa
--- 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 26, 2019</td>
+    <td class="foot-date">September 8, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - 7cfbf0759a0092d984be291e3974774febbfdce2
blob + c8133f091fcc483302647ab94d5f049abe7a3852
--- got.1.html
+++ got.1.html
@@ -105,7 +105,12 @@
       reference which provides a branch name for the newly created commit. Show
       the path of each imported file to indicate progress.
     <p class="Pp">The <code class="Cm">got import</code> command requires the
-        <code class="Ev">GOT_AUTHOR</code> environment variable to be set.</p>
+        <code class="Ev">GOT_AUTHOR</code> environment variable to be set,
+        unless Git's <code class="Dv">user.name</code> and
+        <code class="Dv">user.email configuration settings can be</code>
+        obtained from the repository's <span class="Pa">.git/config</span> file
+        or from Git's global <span class="Pa">~/.gitconfig</span> configuration
+        file.</p>
     <p class="Pp">The options for <code class="Cm">got import</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -714,7 +719,12 @@
         consistent by running <code class="Cm">got update</code> across the
         entire work tree.</p>
     <p class="Pp">The <code class="Cm">got commit</code> command requires the
-        <code class="Ev">GOT_AUTHOR</code> environment variable to be set.</p>
+        <code class="Ev">GOT_AUTHOR</code> environment variable to be set,
+        unless Git's <code class="Dv">user.name</code> and
+        <code class="Dv">user.email configuration settings can be</code>
+        obtained from the repository's <span class="Pa">.git/config</span> file
+        or from Git's global <span class="Pa">~/.gitconfig</span> configuration
+        file.</p>
     <p class="Pp">The options for <code class="Cm">got commit</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -1232,13 +1242,23 @@
 <dl class="Bl-tag">
   <dt><a class="permalink" href="#GOT_AUTHOR"><code class="Ev" id="GOT_AUTHOR">GOT_AUTHOR</code></a></dt>
   <dd>The author's name and email address for <code class="Cm">got commit</code>
-      and <code class="Cm">got import</code>, for example: <span class="An">Flan
-      Hacker</span>
-      &lt;<a class="Mt" href="mailto:flan_hacker@openbsd.org">flan_hacker@openbsd.org</a>&gt;.
+      and <code class="Cm">got import</code>, for example:
+      &#x201C;<span class="An">Flan Hacker</span>
+      &lt;<a class="Mt" href="mailto:flan_hacker@openbsd.org">flan_hacker@openbsd.org</a>&gt;&#x201D;.
       Because <a class="Xr">git(1)</a> may fail to parse commits without an
       email address in author data, <code class="Nm">got</code> attempts to
       reject <code class="Ev">GOT_AUTHOR</code> environment variables with a
-      missing email address.</dd>
+      missing email address.
+    <p class="Pp">If present, Git's <code class="Dv">user.name</code> and
+        <code class="Dv">user.email configuration settings in the
+        repository's</code> <span class="Pa">.git/config</span> file will
+        override the value of <code class="Ev">GOT_AUTHOR</code>. However, the
+        <code class="Dv">user.name</code> and <code class="Dv">user.email</code>
+        configuration settings contained in Git's global
+        <span class="Pa">~/.gitconfig</span> configuration file will be used
+        only if the <code class="Ev">GOT_AUTHOR</code> environment variable is
+        <i class="Em">not</i> set.</p>
+  </dd>
   <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>,
@@ -1439,7 +1459,7 @@ Clone an existing Git repository for use with <code cl
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 26, 2019</td>
+    <td class="foot-date">September 8, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>
blob - 771e552de978a8a195a7d61360e2e134506d1a30
blob + 4bff09ce10fcff731d4fa2b90559c9a095df4f1b
--- tog.1.html
+++ tog.1.html
@@ -353,7 +353,7 @@ The <code class="Nm">tog</code> utility exits&#x00A0;0
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 26, 2019</td>
+    <td class="foot-date">September 8, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>