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.txt | |
| parent | d0a9940c76b71c9df840a098a423d3400779d83c (diff) | |
| download | git-htmldocs-c9f11c2b3a739e3e249b9e7711bf1ed76ef3c6db.tar.gz | |
Autogenerated HTML docs for v2.22.0-428-g6d5b2
Diffstat (limited to 'git-stash.txt')
| -rw-r--r-- | git-stash.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-stash.txt b/git-stash.txt index e31ea7d30..8fbe12c66 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -235,12 +235,12 @@ return to your original branch to make the emergency fix, like this: + ---------------------------------------------------------------- # ... 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 ... ---------------------------------------------------------------- @@ -293,7 +293,8 @@ SEE ALSO linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], -linkgit:git-reset[1] +linkgit:git-reset[1], +linkgit:git-switch[1] GIT --- |