summaryrefslogtreecommitdiffstats
path: root/git-restore.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-25 13:12:55 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-25 13:12:55 -0800
commit2f5a9896b8a0020ce124ca87764bc91f565e48bb (patch)
tree169d2a3dbcd625aef74728e004d2d20157a5bcbd /git-restore.html
parent2267da58fbe3aef887c21a27fd6b056bf6b38fcf (diff)
downloadgit-htmldocs-2f5a9896b8a0020ce124ca87764bc91f565e48bb.tar.gz
Autogenerated HTML docs for v2.25.0-rc0
Diffstat (limited to 'git-restore.html')
-rw-r--r--git-restore.html47
1 files changed, 44 insertions, 3 deletions
diff --git a/git-restore.html b/git-restore.html
index 775d169eb..b6ffd2968 100644
--- a/git-restore.html
+++ b/git-restore.html
@@ -749,8 +749,9 @@ git-restore(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git restore</em> [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] &lt;pathspec&gt;&#8230;
-<em>git restore</em> (-p|--patch) [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] [&lt;pathspec&gt;&#8230;]</pre>
+<pre class="content"><em>git restore</em> [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] [--] &lt;pathspec&gt;&#8230;
+<em>git restore</em> [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] --pathspec-from-file=&lt;file&gt; [--pathspec-file-nul]
+<em>git restore</em> (-p|--patch) [&lt;options&gt;] [--source=&lt;tree&gt;] [--staged] [--worktree] [--] [&lt;pathspec&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
</div>
@@ -929,6 +930,46 @@ in <a href="git-checkout.html">git-checkout(1)</a> for details.</p></div>
<code>&lt;tree&gt;</code> exactly. The default is no-overlay mode.
</p>
</dd>
+<dt class="hdlist1">
+--pathspec-from-file=&lt;file&gt;
+</dt>
+<dd>
+<p>
+ Pathspec is passed in <code>&lt;file&gt;</code> instead of commandline args. If
+ <code>&lt;file&gt;</code> is exactly <code>-</code> then standard input is used. Pathspec
+ elements are separated by LF or CR/LF. Pathspec elements can be
+ quoted as explained for the configuration variable <code>core.quotePath</code>
+ (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and
+ global <code>--literal-pathspecs</code>.
+</p>
+</dd>
+<dt class="hdlist1">
+--pathspec-file-nul
+</dt>
+<dd>
+<p>
+ Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are
+ separated with NUL character and all other characters are taken
+ literally (including newlines and quotes).
+</p>
+</dd>
+<dt class="hdlist1">
+--
+</dt>
+<dd>
+<p>
+ Do not interpret any more arguments as options.
+</p>
+</dd>
+<dt class="hdlist1">
+&lt;pathspec&gt;&#8230;
+</dt>
+<dd>
+<p>
+ Limits the paths affected by the operation.
+</p>
+<div class="paragraph"><p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p></div>
+</dd>
</dl></div>
</div>
</div>
@@ -1015,7 +1056,7 @@ as using <a href="git-checkout.html">git-checkout(1)</a>)</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2019-08-08 14:41:52 PDT
+ 2019-12-25 13:09:50 PST
</div>
</div>
</body>