Adds in the 08 Rebase episode and updates the End episode with furthe…

…r training links.
MetOffice · Nov 17, 2024 · 7f1847f · 7f1847f
1 parent f306c58
commit 7f1847f
Show file tree

Hide file tree

Showing 4 changed files with 543 additions and 2 deletions.
diff --git a/config.yaml b/config.yaml
@@ -66,6 +66,8 @@ episodes:
 - Break.md
 - 05-forks.md
 - 06-conflict.md
+- 07-history.md
+- 08-rebase.md
 - End.md
 
 

diff --git a/episodes/07-history.md b/episodes/07-history.md
@@ -81,7 +81,7 @@ The key here is `--graph` shows us the graphical
 representation of our history on the left of the
 terminal.
 `*`'s are commits which are connected by lines.
-The vertical lines on the far left represent the `main` branch.
+The vertical lines represent links between commits.
 The output above shows two feature branches each with
 only one commit which were then merged back into
 `main` via a pull request.