@@ -106,7 +106,7 @@ Finally, we go through some of the details of what it actually does behind the s
 ==== git clone
 
 The `git clone` command is actually something of a wrapper around several other commands.
-It creates a new directory, goes into it and runs `git init` to make it an empty Git repository, adds a remote (`git remote add`) to the URL that you pass it (by default named `origin`), runs a `git fetch` from that remote repository and then checks out the latest commit into your working directory with `git checkout`.
+It creates a new directory, goes into it and runs `git init` to make it an empty Git repository, adds a remote (`git remote add`) to the URL that you pass it (by default named `origin`), runs a `git fetch` from that remote repository and then checks out the latest commit into your working directory with `git switch`.
 
 The `git clone` command is used in dozens of places throughout the book, but we'll just list a few interesting places.
 
 
@@ -292,7 +292,7 @@ Thus, if you need to make changes -- say you're fixing a bug on an older version
 
 [source,console]
 ----
-$ git checkout -b version2 v2.0.0
+$ git switch -c version2 v2.0.0
 Switched to a new branch 'version2'
 ----
 
 
@@ -25,11 +25,11 @@ First, let's say you're working on your project and have a couple of commits alr
 image::images/basic-branching-1.png[A simple commit history]
 
 You've decided that you're going to work on issue #53 in whatever issue-tracking system your company uses.
-To create a new branch and switch to it at the same time, you can run the `git checkout` command with the `-b` switch:
+To create a new branch and switch to it at the same time, you can run the `git switch` command with the `-c` switch:
 
 [source,console]
 ----
-$ git checkout -b iss53
+$ git switch -c iss53
 Switched to a new branch "iss53"
 ----
 
@@ -38,7 +38,7 @@ This is shorthand for:
 [source,console]
 ----
 $ git branch iss53
-$ git checkout iss53
+$ git switch iss53
 ----
 
 .Creating a new branch pointer
@@ -67,7 +67,7 @@ For now, let's assume you've committed all your changes, so you can switch back
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 Switched to branch 'master'
 ----
 
@@ -80,7 +80,7 @@ Let's create a `hotfix` branch on which to work until it's completed:
 
 [source,console]
 ----
-$ git checkout -b hotfix
+$ git switch -c hotfix
 Switched to a new branch 'hotfix'
 $ vim index.html
 $ git commit -a -m 'Fix broken email address'
@@ -96,7 +96,7 @@ You do this with the `git merge` command:(((git commands, merge)))
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 $ git merge hotfix
 Updating f42c576..3a0874c
 Fast-forward
@@ -127,7 +127,7 @@ Now you can switch back to your work-in-progress branch on issue #53 and continu
 
 [source,console]
 ----
-$ git checkout iss53
+$ git switch iss53
 Switched to branch "iss53"
 $ vim index.html
 $ git commit -a -m 'Finish the new footer [issue 53]'
@@ -151,7 +151,7 @@ All you have to do is check out the branch you wish to merge into and then run t
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 Switched to branch 'master'
 $ git merge iss53
 Merge made by the 'recursive' strategy.
 
@@ -67,7 +67,7 @@ The options described above, `--merged` and `--no-merged` will, if not given a c
 You can always provide an additional argument to ask about the merge state with respect to some other branch without checking that other branch out first, as in, what is not merged into the `master` branch?
 [source,console]
 ----
-$ git checkout testing
+$ git switch testing
 $ git branch --no-merged master
   topicA
   featureB
 
@@ -91,12 +91,12 @@ You can see the `master` and `testing` branches that are right there next to the
 ==== Switching Branches
 
 (((branches, switching)))
-To switch to an existing branch, you run the `git checkout` command.(((git commands, checkout)))
+To switch to an existing branch, you run the `git switch` command.(((git commands, switch)))
 Let's switch to the new `testing` branch:
 
 [source,console]
 ----
-$ git checkout testing
+$ git switch testing
 ----
 
 This moves `HEAD` to point to the `testing` branch.
@@ -116,12 +116,12 @@ $ git commit -a -m 'Make a change'
 .The HEAD branch moves forward when a commit is made
 image::images/advance-testing.png[The HEAD branch moves forward when a commit is made]
 
-This is interesting, because now your `testing` branch has moved forward, but your `master` branch still points to the commit you were on when you ran `git checkout` to switch branches.
+This is interesting, because now your `testing` branch has moved forward, but your `master` branch still points to the commit you were on when you ran `git switch` to switch branches.
 Let's switch back to the `master` branch:
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 ----
 
 [NOTE]
@@ -136,8 +136,8 @@ To show commit history for the desired branch you have to explicitly specify it:
 To show all of the branches, add `--all` to your `git log` command.
 ====
 
-.HEAD moves when you checkout
-image::images/checkout-master.png[HEAD moves when you checkout]
+.HEAD moves when you switch
+image::images/switch-to-master.png[HEAD moves when you switch]
 
 That command did two things.
 It moved the HEAD pointer back to point to the `master` branch, and it reverted the files in your working directory back to the snapshot that `master` points to.
@@ -163,7 +163,7 @@ $ git commit -a -m 'Make other changes'
 Now your project history has diverged (see <<divergent_history>>).
 You created and switched to a branch, did some work on it, and then switched back to your main branch and did other work.
 Both of those changes are isolated in separate branches: you can switch back and forth between the branches and merge them together when you're ready.
-And you did all that with simple `branch`, `checkout`, and `commit` commands.
+And you did all that with simple `branch`, `switch`, and `commit` commands.
 
 [[divergent_history]]
 .Divergent history
@@ -196,15 +196,22 @@ Let's see why you should do so.
 [NOTE]
 .Creating a new branch and switching to it at the same time
 ====
-It's typical to create a new branch and want to switch to that new branch at the same time -- this can be done in one operation with `git checkout -b <newbranchname>`.
+It's typical to create a new branch and want to switch to that new branch at the same time -- this can be done in one operation with `git switch -c <newbranchname>`.
+
+The `-c` flag stands for create, you can also use the full flag: `--create`.
+====
+
+[TIP]
+====
+To return to your previously checked out branch, also `git switch -` works, so you don't have to type that branche's name.
 ====
 
 [NOTE]
 ====
-From Git version 2.23 onwards you can use `git switch` instead of `git checkout` to:
+In Git versions before 2.23, `git switch` wasn't yet available.
+`git checkout` can be used instead:
 
-- Switch to an existing branch: `git switch testing-branch`.
-- Create a new branch and switch to it: `git switch -c new-branch`.
-  The `-c` flag stands for create, you can also use the full flag: `--create`.
-- Return to your previously checked out branch: `git switch -`.
+- Switch to an existing branch: `git checkout testing-branch --`.
+- Create a new branch and switch to it: `git checkout -b new-branch`.
+  The `-b` flag stands for "`[create a new] **b**ranch`", but doesn't have a long-option equivalent.
 ====
@@ -27,7 +27,7 @@ For this example, you would check out the `experiment` branch, and then rebase i
 
 [source,console]
 ----
-$ git checkout experiment
+$ git switch experiment
 $ git rebase master
 First, rewinding head to replay your work on top of it...
 Applying: added staged command
@@ -42,7 +42,7 @@ At this point, you can go back to the `master` branch and do a fast-forward merg
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 $ git merge experiment
 ----
 
@@ -90,7 +90,7 @@ Now you can fast-forward your `master` branch (see <<rbdiag_g>>):
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 $ git merge client
 ----
 
@@ -116,7 +116,7 @@ Then, you can fast-forward the base branch (`master`):
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 $ git merge server
 ----
 
 
@@ -119,7 +119,7 @@ If you want your own `serverfix` branch that you can work on, you can base it of
 
 [source,console]
 ----
-$ git checkout -b serverfix origin/serverfix
+$ git switch -c serverfix origin/serverfix
 Branch serverfix set up to track remote branch serverfix from origin.
 Switched to a new branch 'serverfix'
 ----
@@ -136,12 +136,12 @@ If you're on a tracking branch and type `git pull`, Git automatically knows whic
 
 When you clone a repository, it generally automatically creates a `master` branch that tracks `origin/master`.
 However, you can set up other tracking branches if you wish -- ones that track branches on other remotes, or don't track the `master` branch.
-The simple case is the example you just saw, running `git checkout -b <branch> <remote>/<branch>`.
+The simple case is the example you just saw, running `git switch -c <branch> <remote>/<branch>`.
 This is a common enough operation that Git provides the `--track` shorthand:
 
 [source,console]
 ----
-$ git checkout --track origin/serverfix
+$ git switch --track origin/serverfix
 Branch serverfix set up to track remote branch serverfix from origin.
 Switched to a new branch 'serverfix'
 ----
@@ -151,7 +151,7 @@ If the branch name you're trying to checkout (a) doesn't exist and (b) exactly m
 
 [source,console]
 ----
-$ git checkout serverfix
+$ git switch serverfix
 Branch serverfix set up to track remote branch serverfix from origin.
 Switched to a new branch 'serverfix'
 ----
@@ -160,7 +160,7 @@ To set up a local branch with a different name than the remote branch, you can e
 
 [source,console]
 ----
-$ git checkout -b sf origin/serverfix
+$ git switch -c sf origin/serverfix
 Branch sf set up to track remote branch serverfix from origin.
 Switched to a new branch 'sf'
 ----
 
@@ -265,7 +265,7 @@ First (having committed all of the work on her `issue54` topic branch), Jessica
 
 [source,console]
 ----
-$ git checkout master
+$ git switch master
 Switched to branch 'master'
 Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
 ----
@@ -341,7 +341,7 @@ She creates a new branch for the feature and does some work on it there:
 [source,console]
 ----
 # Jessica's Machine
-$ git checkout -b featureA
+$ git switch -c featureA
 Switched to a new branch 'featureA'
 $ vim lib/simplegit.rb
 $ git commit -am 'Add limit to log function'
@@ -368,7 +368,7 @@ To begin, she starts a new feature branch, basing it off the server's `master` b
 ----
 # Jessica's Machine
 $ git fetch origin
-$ git checkout -b featureB origin/master
+$ git switch -c featureB origin/master
 Switched to a new branch 'featureB'
 ----
 
@@ -456,7 +456,7 @@ If Jessica likes what she sees, she can merge John's new work into her local `fe
 
 [source,console]
 ----
-$ git checkout featureA
+$ git switch featureA
 Switched to branch 'featureA'
 $ git merge origin/featureA
 Updating 3300904..aad881d
@@ -513,7 +513,7 @@ The sequence looks basically like this:
 ----
 $ git clone <url>
 $ cd project
-$ git checkout -b featureA
+$ git switch -c featureA
   ... work ...
 $ git commit
   ... work ...
@@ -579,7 +579,7 @@ For example, if you want to submit a second topic of work to the project, don't
 
 [source,console]
 ----
-$ git checkout -b featureB origin/master
+$ git switch -c featureB origin/master
   ... work ...
 $ git commit
 $ git push myfork featureB
@@ -598,7 +598,7 @@ In this case, you can try to rebase that branch on top of `origin/master`, resol
 
 [source,console]
 ----
-$ git checkout featureA
+$ git switch featureA
 $ git rebase origin/master
 $ git push -f myfork featureA
 ----
@@ -619,7 +619,7 @@ You start a new branch based off the current `origin/master` branch, squash the
 (((git commands, merge, squash)))
 [source,console]
 ----
-$ git checkout -b featureBv2 origin/master
+$ git switch -c featureBv2 origin/master
 $ git merge --squash featureB
   ... change implementation ...
 $ git commit
@@ -648,7 +648,7 @@ Instead of forking the project and pushing to your own writable version, you gen
 
 [source,console]
 ----
-$ git checkout -b topicA
+$ git switch -c topicA
   ... work ...
 $ git commit
   ... work ...
 
@@ -19,11 +19,11 @@ As you'll remember, you can create the branch based off your `master` branch lik
 $ git branch sc/ruby_client master
 ----
 
-Or, if you want to also switch to it immediately, you can use the `checkout -b` option:
+Or, if you want to also switch to it immediately, you can use the `switch -c` option:
 
 [source,console]
 ----
-$ git checkout -b sc/ruby_client master
+$ git switch -c sc/ruby_client master
 ----
 
 Now you're ready to add the contributed work that you received into this topic branch and determine if you want to merge it into your longer-term branches.
@@ -193,7 +193,7 @@ For instance, if Jessica sends you an email saying that she has a great new feat
 ----
 $ git remote add jessica https://github.com/jessica/myproject.git
 $ git fetch jessica
-$ git checkout -b rubyclient jessica/ruby-client
+$ git switch -c rubyclient jessica/ruby-client
 ----
 
 If she emails you again later with another branch containing another great feature, you could directly `fetch` and `checkout` because you already have the remote setup.
@@ -499,7 +499,7 @@ In fact, if you build Git from source code cloned from the Git repository, `git
 If you're describing a commit that you have directly tagged, it gives you simply the tag name.
 
 By default, the `git describe` command requires annotated tags (tags created with the `-a` or `-s` flag); if you want to take advantage of lightweight (non-annotated) tags as well, add the `--tags` option to the command.
-You can also use this string as the target of a `git checkout` or `git show` command, although it relies on the abbreviated SHA-1 value at the end, so it may not be valid forever.
+You can also use this string as the target of a `git switch` or `git show` command, although it relies on the abbreviated SHA-1 value at the end, so it may not be valid forever.
 For instance, the Linux kernel recently jumped from 8 to 10 characters to ensure SHA-1 object uniqueness, so older `git describe` output names were invalidated.
 
 [[_preparing_release]]
 
@@ -76,7 +76,7 @@ $ git clone https://github.com/tonychacon/blink <1>
 Cloning into 'blink'...
 
 $ cd blink
-$ git checkout -b slow-blink <2>
+$ git switch -c slow-blink <2>
 Switched to a new branch 'slow-blink'
 
 $ sed -i '' 's/1000/3000/' blink.ino (macOS) <3>
@@ -504,7 +504,7 @@ For example, if you forked from `https://github.com/progit/progit2.git`, you can
 
 [source,console]
 ----
-$ git checkout master <1>
+$ git switch master <1>
 $ git pull https://github.com/progit/progit2.git <2>
 $ git push origin master <3>
 ----
@@ -534,7 +534,7 @@ Once this is done, the workflow becomes much simpler:
 
 [source,console]
 ----
-$ git checkout master <1>
+$ git switch master <1>
 $ git pull <2>
 $ git push <3>
 ----