summaryrefslogtreecommitdiffstats
path: root/gittutorial.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-09 19:54:04 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-09 19:54:04 -0700
commitc9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db (patch)
tree06ddfc72dff8e370e395a3acc692c8ab48147227 /gittutorial.html
parentd0a9940c76b71c9df840a098a423d3400779d83c (diff)
downloadgit-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'gittutorial.html')
-rw-r--r--gittutorial.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/gittutorial.html b/gittutorial.html
index d6670f132..a77c2cd93 100644
--- a/gittutorial.html
+++ b/gittutorial.html
@@ -843,7 +843,7 @@ summary of the situation with <em>git status</em>:</p></div>
On branch master
Changes to be committed:
Your branch is up to date with 'origin/master'.
- (use "git reset HEAD &lt;file&gt;..." to unstage)
+ (use "git restore --staged &lt;file&gt;..." to unstage)
modified: file1
modified: file2
@@ -932,7 +932,7 @@ automatically. The asterisk marks the branch you are currently on;
type</p></div>
<div class="listingblock">
<div class="content">
-<pre><code>$ git checkout experimental</code></pre>
+<pre><code>$ git switch experimental</code></pre>
</div></div>
<div class="paragraph"><p>to switch to the experimental branch. Now edit a file, commit the
change, and switch back to the master branch:</p></div>
@@ -940,7 +940,7 @@ change, and switch back to the master branch:</p></div>
<div class="content">
<pre><code>(edit file)
$ git commit -a
-$ git checkout master</code></pre>
+$ git switch master</code></pre>
</div></div>
<div class="paragraph"><p>Check that the change you made is no longer visible, since it was
made on the experimental branch and you&#8217;re back on the master branch.</p></div>
@@ -1375,7 +1375,7 @@ digressions that may be interesting at this point are:</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2019-07-09 19:51:04 PDT
</div>
</div>
</body>