commit fc62dacd88663035e71fd2a30864a88216793660
from: Stefan Sperling <stsp@stsp.name>
date: Thu Aug 08 12:50:39 2019 UTC

sync man pge

commit - cdd51db24dcce1a0666c5a00d3cbbbe6851f6d13
commit + fc62dacd88663035e71fd2a30864a88216793660
blob - 693753d5fba7f6e7cccd111a459cab627e556718
blob + a9b70f335fa31d7d78766517b5f65224a4dbbc42
--- got.1.html
+++ got.1.html
@@ -298,16 +298,16 @@
         <td>file deletion is staged</td>
       </tr>
     </table>
-    <p class="Pp">If a path has staged changes, modification status of files
-        shown in the first output column is relative to the staged changes:</p>
+    <p class="Pp">Changes created on top of staged changes are indicated in the
+        first column:</p>
     <table class="Bl-column">
       <tr>
         <td>MM</td>
-        <td>modified file was modified again after being staged</td>
+        <td>file was modified after earlier changes have been staged</td>
       </tr>
       <tr>
         <td>MA</td>
-        <td>added file was modified after being staged</td>
+        <td>file was modified after having been staged for addition</td>
       </tr>
     </table>
   </dd>
@@ -978,7 +978,7 @@
         changes relative to staged changes, and to display staged changes
         relative to the repository. The <code class="Cm">got revert</code>
         command cannot revert staged changes but may be used to revert local
-        changes relative to staged changes.</p>
+        changes created on top of staged changes.</p>
     <p class="Pp">The options for <code class="Cm">got stage</code> are as
         follows:</p>
     <dl class="Bl-tag">
@@ -989,11 +989,12 @@
           the specified paths. Otherwise, show all staged paths.</dd>
       <dt><a class="permalink" href="#p_3"><code class="Fl" id="p_3">-p</code></a></dt>
       <dd>Instead of staging the entire content of a changed file, interactively
-          select or reject changes for staging based on &#x201C;y&#x201D;
-          (select), &#x201C;n&#x201D; (reject), and &#x201C;q&#x201D; (quit)
-          responses. If a file is in modified status, individual patches derived
-          from the modified file content can be staged. Files in added or
-          deleted status may be staged or rejected in their entirety.</dd>
+          select or reject changes for staging based on &#x201C;y&#x201D; (stage
+          change), &#x201C;n&#x201D; (reject change), and &#x201C;q&#x201D;
+          (quit staging this file) responses. If a file is in modified status,
+          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><a class="permalink" href="#F"><code class="Fl" id="F">-F</code></a>
         <var class="Ar">response-script</var></dt>
       <dd>With the <code class="Fl">-p</code> option, read &#x201C;y&#x201D;,
@@ -1019,7 +1020,8 @@
   <dt><a class="permalink" href="#sg"><code class="Cm" id="sg">sg</code></a></dt>
   <dd>Short alias for <code class="Cm">stage</code>.</dd>
   <dt><a class="permalink" href="#unstage"><code class="Cm" id="unstage">unstage</code></a>
-    [<var class="Ar">path ...</var>]</dt>
+    [<code class="Fl">-p</code>] [<code class="Fl">-F</code>
+    <var class="Ar">response-script</var>] [<var class="Ar">path ...</var>]</dt>
   <dd>Merge staged changes back into the work tree and put affected paths back
       into non-staged status. If no <var class="Ar">path</var> is specified,
       unstage all staged changes across the entire work tree. Otherwise, unstage
@@ -1052,6 +1054,24 @@
         <td>changes destined for a non-regular file were not merged</td>
       </tr>
     </table>
+    <p class="Pp">The options for <code class="Cm">got unstage</code> are as
+        follows:</p>
+    <dl class="Bl-tag">
+      <dt><a class="permalink" href="#p_4"><code class="Fl" id="p_4">-p</code></a></dt>
+      <dd>Instead of unstaging the entire content of a changed file,
+          interactively select or reject changes for unstaging based on
+          &#x201C;y&#x201D; (unstage change), &#x201C;n&#x201D; (keep change
+          staged), and &#x201C;q&#x201D; (quit unstaging this file) responses.
+          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><a class="permalink" href="#F_2"><code class="Fl" id="F_2">-F</code></a>
+        <var class="Ar">response-script</var></dt>
+      <dd>With the <code class="Fl">-p</code> option, read &#x201C;y&#x201D;,
+          &#x201C;n&#x201D;, and &#x201C;q&#x201D; responses line-by-line from
+          the specified <var class="Ar">response-script</var> file instead of
+          prompting interactively.</dd>
+    </dl>
   </dd>
   <dt><a class="permalink" href="#ug"><code class="Cm" id="ug">ug</code></a></dt>
   <dd>Short alias for <code class="Cm">unstage</code>.</dd>
@@ -1253,7 +1273,7 @@ Clone an existing Git repository for use with <code cl
 </div>
 <table class="foot">
   <tr>
-    <td class="foot-date">August 7, 2019</td>
+    <td class="foot-date">August 8, 2019</td>
     <td class="foot-os">OpenBSD 6.5</td>
   </tr>
 </table>