commit - a1650ec76e5fd6888ac4dd5210b1ffe86a44247c
commit + e0ed36ae557725ae2d42635cf55b09396ebbef58
blob - 871bdb92f5fd2c5e7b0c168a5bd8eb22ad5037b0
blob + 7918d874e9b5e72047228847d761f793c8b49830
--- got.1.html
+++ got.1.html
<dt><a class="permalink" href="#he"><code class="Cm" id="he">he</code></a></dt>
<dd>Short alias for <code class="Cm">histedit</code>.</dd>
<dt><a class="permalink" href="#stage"><code class="Cm" id="stage">stage</code></a>
- [<code class="Fl">-l</code>] <var class="Ar">file-path ...</var></dt>
- <dd>Stage local changes at the specified paths for inclusion in the next
- commit. Paths may be staged if they are added, modified, or deleted
- according to <code class="Cm">got status</code>.
+ [<code class="Fl">-l</code>] [<code class="Fl">-p</code>]
+ [<code class="Fl">-F</code>] [<var class="Ar">path ...</var>]</dt>
+ <dd>Stage local changes for inclusion in the next commit. If no
+ <var class="Ar">path</var> is specified, stage all changes in the work
+ tree. Otherwise, stage changes at or within the specified paths. Paths may
+ be staged if they are added, modified, or deleted according to
+ <code class="Cm">got status</code>.
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
along with the IDs of staged blob objects and stage status codes. If
paths were provided in the command line show the staged paths among
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 “y”
+ (select), “n” (reject), and “q” (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>
+ <dt><a class="permalink" href="#F"><code class="Fl" id="F">-F</code></a>
+ <var class="Ar">path</var></dt>
+ <dd>With the <code class="Fl">-p</code> option, read responses
+ line-by-line from a script file at the specified
+ <var class="Ar">path</var> instead of prompting interactively.</dd>
</dl>
<p class="Pp"><code class="Cm">got stage</code> will refuse to run if
certain preconditions are not met. If a file contains merge conflicts,
[<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.
+ unstage all staged changes across the entire work tree. Otherwise, unstage
+ changes at or within the specified paths.
<p class="Pp">Show the status of each affected file, using the following
status codes:</p>
<table class="Bl-column">
</div>
<table class="foot">
<tr>
- <td class="foot-date">August 6, 2019</td>
+ <td class="foot-date">August 7, 2019</td>
<td class="foot-os">OpenBSD 6.5</td>
</tr>
</table>