Commit Diff

Commit:
39293a23f638adfba08e6cef6b9b950578adceb0
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
sync man pages
Actions:
Patch | Tree
commit - c2a52be55ae480322872a422de5f90d5a65f2957
commit + 39293a23f638adfba08e6cef6b9b950578adceb0
blob - c8133f091fcc483302647ab94d5f049abe7a3852
blob + c602d0cba9edd0c73b6dcf52135a42f4778adeed
--- got.1.html
+++ got.1.html
@@ -107,7 +107,7 @@
     <p class="Pp">The <code class="Cm">got import</code> command requires the
         <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>
+        <code class="Dv">user.email</code> configuration settings can be
         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>
@@ -721,7 +721,7 @@
     <p class="Pp">The <code class="Cm">got commit</code> command requires the
         <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>
+        <code class="Dv">user.email</code> configuration settings can be
         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>
@@ -1250,9 +1250,9 @@
       reject <code class="Ev">GOT_AUTHOR</code> environment variables with a
       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.email</code> configuration settings in the
+        repository's <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