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-stash.html | |
parent | d0a9940c76b71c9df840a098a423d3400779d83c (diff) | |
download | git-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz |
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'git-stash.html')
-rw-r--r-- | git-stash.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-stash.html b/git-stash.html index 710109bdb..2bc4cc93e 100644 --- a/git-stash.html +++ b/git-stash.html @@ -1025,12 +1025,12 @@ return to your original branch to make the emergency fix, like this: <div class="listingblock">
<div class="content">
<pre><code># ... hack hack hack ...
-$ git checkout -b my_wip
+$ git switch -c my_wip
$ git commit -a -m "WIP"
-$ git checkout master
+$ git switch master
$ edit emergency fix
$ git commit -a -m "Fix in a hurry"
-$ git checkout my_wip
+$ git switch my_wip
$ git reset --soft HEAD^
# ... continue hacking ...</code></pre>
</div></div>
@@ -1093,7 +1093,8 @@ xargs git log --merges --no-walk --grep=WIP</code></pre> <div class="paragraph"><p><a href="git-checkout.html">git-checkout(1)</a>,
<a href="git-commit.html">git-commit(1)</a>,
<a href="git-reflog.html">git-reflog(1)</a>,
-<a href="git-reset.html">git-reset(1)</a></p></div>
+<a href="git-reset.html">git-reset(1)</a>,
+<a href="git-switch.html">git-switch(1)</a></p></div>
</div>
</div>
<div class="sect1">
@@ -1107,7 +1108,7 @@ xargs git log --merges --no-walk --grep=WIP</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2019-04-21 20:35:42 PDT
+ 2019-07-09 19:51:04 PDT
</div>
</div>
</body>
|