diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 19:54:04 -0700 |
| commit | c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db (patch) | |
| tree | 06ddfc72dff8e370e395a3acc692c8ab48147227 /git.html | |
| parent | d0a9940c76b71c9df840a098a423d3400779d83c (diff) | |
| download | git-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz | |
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'git.html')
| -rw-r--r-- | git.html | 48 |
1 files changed, 47 insertions, 1 deletions
@@ -1282,6 +1282,14 @@ ancillary user utilities.</p></div> </p>
</dd>
<dt class="hdlist1">
+<a href="git-restore.html">git-restore(1)</a>
+</dt>
+<dd>
+<p>
+ Restore working tree files.
+</p>
+</dd>
+<dt class="hdlist1">
<a href="git-revert.html">git-revert(1)</a>
</dt>
<dd>
@@ -1338,6 +1346,14 @@ ancillary user utilities.</p></div> </p>
</dd>
<dt class="hdlist1">
+<a href="git-switch.html">git-switch(1)</a>
+</dt>
+<dd>
+<p>
+ Switch branches.
+</p>
+</dd>
+<dt class="hdlist1">
<a href="git-tag.html">git-tag(1)</a>
</dt>
<dd>
@@ -1659,6 +1675,36 @@ people via patch over e-mail.</p></div> </dd>
</dl></div>
</div>
+<div class="sect2">
+<h3 id="_reset_restore_and_revert">Reset, restore and revert</h3>
+<div class="paragraph"><p>There are three commands with similar names: <code>git reset</code>,
+<code>git restore</code> and <code>git revert</code>.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="git-revert.html">git-revert(1)</a> is about making a new commit that reverts the
+ changes made by other commits.
+</p>
+</li>
+<li>
+<p>
+<a href="git-restore.html">git-restore(1)</a> is about restoring files in the working tree
+ from either the index or another commit. This command does not
+ update your branch. The command can also be used to restore files in
+ the index from another commit.
+</p>
+</li>
+<li>
+<p>
+<a href="git-reset.html">git-reset(1)</a> is about updating your branch, moving the tip
+ in order to add or remove commits from the branch. This operation
+ changes the commit history.
+</p>
+<div class="paragraph"><p><code>git reset</code> can also be used to restore the index, overlapping with
+<code>git restore</code>.</p></div>
+</li>
+</ul></div>
+</div>
</div>
</div>
<div class="sect1">
@@ -3249,7 +3295,7 @@ the Git Security mailing list <<a href="mailto:git-security@googlegroups.com" <div id="footer">
<div id="footer-text">
Last updated
- 2019-06-17 20:21:34 PDT
+ 2019-07-09 19:51:04 PDT
</div>
</div>
</body>
|