diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-08 15:27:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 15:27:04 -0700 |
| commit | 2b43cff1c1e6418402997ad8a78ff0a401a5957a (patch) | |
| tree | d11eea5eb084d04a628671597a15e2df94d553c8 /git-restore.html | |
| parent | dd4c178beaaa13be1f0211908f194c136b341973 (diff) | |
| download | git-htmldocs-2b43cff1c1e6418402997ad8a78ff0a401a5957a.tar.gz | |
Autogenerated HTML docs for v2.26.2-593-gb9946
Diffstat (limited to 'git-restore.html')
| -rw-r--r-- | git-restore.html | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/git-restore.html b/git-restore.html index fe64153f7..9c430056b 100644 --- a/git-restore.html +++ b/git-restore.html @@ -765,9 +765,8 @@ source, it will be removed to match the source.</p></div> <div class="paragraph"><p>The command can also be used to restore the content in the index with
<code>--staged</code>, or restore both the working tree and the index with
<code>--staged --worktree</code>.</p></div>
-<div class="paragraph"><p>By default, the restore sources for working tree and the index are the
-index and <code>HEAD</code> respectively. <code>--source</code> could be used to specify a
-commit as the restore source.</p></div>
+<div class="paragraph"><p>By default, if <code>--staged</code> is given, the contents are restored from <code>HEAD</code>,
+otherwise from the index. Use <code>--source</code> to restore from a different commit.</p></div>
<div class="paragraph"><p>See "Reset, restore and revert" in <a href="git.html">git(1)</a> for the differences
between the three commands.</p></div>
<div class="paragraph"><p>THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.</p></div>
@@ -789,10 +788,8 @@ between the three commands.</p></div> tree. It is common to specify the source tree by naming a
commit, branch or tag associated with it.
</p>
-<div class="paragraph"><p>If not specified, the default restore source for the working tree is
-the index, and the default restore source for the index is
-<code>HEAD</code>. When both <code>--staged</code> and <code>--worktree</code> are specified,
-<code>--source</code> must also be specified.</p></div>
+<div class="paragraph"><p>If not specified, the contents are restored from <code>HEAD</code> if <code>--staged</code> is
+given, otherwise from the index.</p></div>
</dd>
<dt class="hdlist1">
-p
@@ -1074,7 +1071,7 @@ as using <a href="git-checkout.html">git-checkout(1)</a>)</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-29 14:18:27 PDT
+ 2020-05-08 15:24:24 PDT
</div>
</div>
</body>
|