commit - fc62dacd88663035e71fd2a30864a88216793660
commit + 7da3b7f66ccdeea3e534a7c8d027f25521df8a8a
blob - a9b70f335fa31d7d78766517b5f65224a4dbbc42
blob + 242033be16d58ec6ad90ebb371a41049dc68e213
--- got.1.html
+++ got.1.html
<dt><a class="permalink" href="#rm"><code class="Cm" id="rm">rm</code></a></dt>
<dd>Short alias for <code class="Cm">remove</code>.</dd>
<dt><a class="permalink" href="#revert"><code class="Cm" id="revert">revert</code></a>
- <var class="Ar">file-path ...</var></dt>
+ [<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
contents will be overwritten with those contained in the work tree's base
commit. There is no way to bring discarded changes back after
<p class="Pp">If a file was added with <code class="Cm">got add</code> it
will become an unversioned file again. If a file was deleted with
<code class="Cm">got remove</code> it will be restored.</p>
+ <p class="Pp">The options for <code class="Cm">got revert</code> are as
+ follows:</p>
+ <dl class="Bl-tag">
+ <dt><a class="permalink" href="#p_3"><code class="Fl" id="p_3">-p</code></a></dt>
+ <dd>Instead of reverting all changes in files, interactively select or
+ reject changes to revert based on “y” (revert change),
+ “n” (keep change), and “q” (quit reverting
+ this file) responses. If a file is in modified status, individual
+ patches derived from the modified file content can be reverted. Files
+ in added or deleted status may only be reverted 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 “y”,
+ “n”, and “q” responses line-by-line from
+ the specified <var class="Ar">response-script</var> file instead of
+ prompting interactively.</dd>
+ <dt><a class="permalink" href="#R_2"><code class="Fl" id="R_2">-R</code></a></dt>
+ <dd>Permit recursion into directories. If this option is not specified,
+ <code class="Cm">got revert</code> will refuse to run if a specified
+ <var class="Ar">path</var> is a directory.</dd>
+ </dl>
</dd>
<dt><a class="permalink" href="#rv"><code class="Cm" id="rv">rv</code></a></dt>
<dd>Short alias for <code class="Cm">revert</code>.</dd>
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>
+ <dt><a class="permalink" href="#p_4"><code class="Fl" id="p_4">-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” (stage
change), “n” (reject change), and “q”
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>
+ <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 “y”,
“n”, and “q” responses line-by-line from
<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>
+ <dt><a class="permalink" href="#p_5"><code class="Fl" id="p_5">-p</code></a></dt>
<dd>Instead of unstaging the entire content of a changed file,
interactively select or reject changes for unstaging based on
“y” (unstage change), “n” (keep change
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>
+ <dt><a class="permalink" href="#F_3"><code class="Fl" id="F_3">-F</code></a>
<var class="Ar">response-script</var></dt>
<dd>With the <code class="Fl">-p</code> option, read “y”,
“n”, and “q” responses line-by-line from
<p class="Pp"></p>
<div class="Bd Bd-indent"><code class="Li">$ got status</code></div>
<div class="Bd Bd-indent"><code class="Li">$ got diff | less</code></div>
+<p class="Pp">Interactively revert selected local changes in a work tree
+ directory:</p>
+<p class="Pp"></p>
+<div class="Bd Bd-indent"><code class="Li">$ got revert -p
+ -R .</code></div>
<p class="Pp">In a work tree or a git repository directory, list all branch
references:</p>
<p class="Pp"></p>