@@ -34,9 +34,9 @@ that you shouldn't try and make commits directly on this branch because it's

 when the remote repository is updated by somebody else, so that there is a "fork"

 in the history:

-          ◯—◯ ← origin/master

-         ╱

-    ◯—◯—◯—◯—◯ ← master

+                                            ◯—◯ ← origin/master

+                                           ╱

+                                      ◯—◯—◯—◯—◯ ← master

 [^1]: This is, of course, tough if you are teaching a Github-centric workflow.

       One way around this may be to get people to initialize their local repositories

@@ -47,15 +47,15 @@ we need to incorporate the changes on `origin/master` with our ones".

 With that you introduce `git merge`, and can show the updated history after that

 operation:

-          ◯—◯ ← origin/master

-         ╱   ╲

-    ◯—◯—◯—◯—◯—◯ ← master

+                                            ◯—◯ ← origin/master

+                                           ╱   ╲

+                                      ◯—◯—◯—◯—◯—◯ ← master

 then you can `git push origin master` and show what that does locally:

-          ◯—◯

-         ╱   ╲

-    ◯—◯—◯—◯—◯—◯ ← master, origin/master

+                                            ◯—◯

+                                           ╱   ╲

+                                      ◯—◯—◯—◯—◯—◯ ← master, origin/master

 Teaching this sequence of operations, it is abundantly clear that `git fetch` only

 updates `origin/master`; it will *never affect what you are working on right now*.