Trying to get the order correct in the mermaid diagram

bbrydsoe · bbrydsoe · commit 8bffe419e2a7 · 2025-10-09T19:46:03.000+02:00
diff --git a/docs/basic-commands.md b/docs/basic-commands.md
@@ -4,7 +4,7 @@ tags: Lecture, Pedro, day 1
 description: "Basic Git commands"
 ---
 
-<!-- Lecture material made by Pedro Ojeda-May for the version of the course that was given in fall 2020. Lecture was first given by Pedro Ojeda-May in fall 2020.-->
+<!-- Lecture material made by Pedro Ojeda-May for the version of the course that was given in fall 2020. Lecture was first given by Pedro Ojeda-May in fall 2020. Moved to GitHub and some tweaks (mainly to graphs) done by Birgitte Brydsö to get it to work on GitHub pages for the 2025 version of the course.-->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/L2-commands --> 
 
diff --git a/docs/basic-concepts.md b/docs/basic-concepts.md
@@ -4,7 +4,7 @@ tags: Lecture, Birgitte, day 2
 description: "What are the basic concepts of Git?"
 ---
 
-<!-- Lecture material made by Mirko Myllykoski for the version of the course that was given in fall 2020. Lecture was first given by Mirko Myllykoski in fall 2020. Various small changes done by Birgitte Brydsö for the fall 2023 and fall 2024 versions of the course.-->
+<!-- Lecture material made by Mirko Myllykoski for the version of the course that was given in fall 2020. Lecture was first given by Mirko Myllykoski in fall 2020. Various small changes done by Birgitte Brydsö for the fall 2023 and fall 2024 versions of the course. Moved to GitHub and some tweaks (mainly to graphs) done by Birgitte Brydsö to get it to work on GitHub pages for the 2025 version of the course. -->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/L3-concepts -->
 
diff --git a/docs/branches.md b/docs/branches.md
@@ -5,7 +5,7 @@ description: "Branches, merges and conflicts"
 ---
 
 <!-- Lecture material made by Birgitte Brydsö for the version of the course that was given in fall 2020. Lecture was first given by Birgitte Brydsö in fall 2020. 
-Minor modifications done for the fall 2021/2022/2023 versions of the course. -->
+Minor modifications done for the fall 2021/2022/2023/2024 versions of the course. Moved to GitHub and some tweaks (mainly to graphs) done by Birgitte Brydsö to get it to work on GitHub pages for the 2025 version of the course. -->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/L5-branches --> 
 
@@ -252,21 +252,24 @@ We commit stuff to both branches
 ```mermaid
 graph LR
 
+  master["master"]
+  style master fill:#ffffff,stroke:#ffffff
+  cool-feature["cool-feature"]
+  style cool-feature fill:#ffffff,stroke:#ffffff
+
   commitX(["commitX"])
   commit1(["commit1"])
   commit2(["commit2"])
   commitY(["commitY"])
   commit3(["commit3"])
 
+  master -.-> commit3
+  cool-feature -.-> commitY 
   commitX --> commit1
   commit2 --> commit1
   commitY --> commitX
   commit3 --> commit2
 
-  master["master"]
-  master -.-> commit3
-  cool-feature["cool-feature"] 
-  cool-feature -.-> commitY 
 ```
 
 (Time goes leftwards)
diff --git a/docs/commits.md b/docs/commits.md
@@ -6,7 +6,7 @@ description: "Commits and commit trees"
 
 # Lecture 4: Commits
 
-<!-- Lecture material made by Mirko Myllykoski for the version of the course that was given in fall~~~~~~~~ 2020. Lecture was first given by Mirko Myllykoski in fall 2020.-->
+<!-- Lecture material made by Mirko Myllykoski for the version of the course that was given in fall~~~~~~~~ 2020. Lecture was first given by Mirko Myllykoski in fall 2020. Moved to GitHub and some tweaks (mainly to graphs) done by Birgitte Brydsö to get it to work on GitHub pages for the 2025 version of the course. -->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/L4-commits --> 
 
diff --git a/docs/intro.md b/docs/intro.md
@@ -5,7 +5,7 @@ description: "Introduction to Git"
 ---
 
 <!-- Lecture material made by Birgitte Brydsö for the version of the course that was given in fall 2020. Lecture was first given by Birgitte Brydsö in fall 2020. 
-Minor modifications done for the fall 2021, 2022, 2023, and 2024 versions of the course. -->
+Minor modifications done for the fall 2021, 2022, 2023, and 2024 versions of the course. Moved to GitHub and some tweaks (mainly to graphs) done to work on GitHub pages for the 2025 version of the course. -->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/LA-intro --> 
 
diff --git a/docs/motivation.md b/docs/motivation.md
@@ -5,7 +5,7 @@ description: "Why use version control?"
 ---
 
 <!-- Lecture material made by Mirko Myllykoski for the version of the course that was given in fall 2020. The lecture was first given by Mirko Myllykoski in fall 2020.
-Very minor modifications have been made by Birgitte Brydsö for the fall 2021, fall 2022, fall 2023, and fall 2024 versions of the course.-->
+Very minor modifications have been made by Birgitte Brydsö for the fall 2021, fall 2022, fall 2023, and fall 2024 versions of the course. Moved to GitHub and some tweaks (mainly to graphs) done by Birgitte Brydsö to get it to work on GitHub pages for the 2025 version of the course. -->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/L1-motivation/ --> 
 
diff --git a/docs/setup.md b/docs/setup.md
@@ -7,7 +7,7 @@ description: "Git installation etc"
 # Lecture 0: Setup
 
 <!-- Lecture material made by Birgitte Brydsö for the version of the course that was given in fall 2020. Lecture was first given by Birgitte Brydsö in fall 2020. 
-Minor modifications done for the fall 2021, 2022, 2023, and 2024 versions of the course. -->
+Minor modifications done for the fall 2021, 2022, 2023, and 2024 versions of the course. Moved to GitHub and some tweaks (mainly to graphs) done by Birgitte Brydsö to get it to work on GitHub pages for the 2025 version of the course. -->
 
 <!-- Slides: https://hackmd.io/@git-fall-2024/L0-setup -->
 
