Merge branch 'main' into spack-reworking

Author: IshaanDesai

01_version_control/my_favorite_neat_little_git_trick_demo.md

@@ -4,7 +4,7 @@
 - Preparation should not take longer than 15 mins, should be a demo.
 - Lecturers also prepare some.
 
-## Tricks from Winter Team 2025/26
+## Tricks from Winter Term 2025/26
 
 - Click on line number on GitHub and then `blame` to study history of file
 - GitHub uses [gitignore templates](https://github.com/github/gitignore) if you create a `.gitignore` file from GitHub
@@ -18,6 +18,22 @@
 - If you rebased/merged and messed up your history, use `git reflog` to go back to a previous state
 - If you only need one file from another commit or branch, use `git checkout <branch_or_sha> -- <path>`
 - Use [Git LFS](https://git-lfs.com/) for big files >10 MB or for non-diffable binaries (e.g., images, media, archives, shared libraries).
+- Use `git switch -c <branch-name>` to create a new branch and immediately check it out!
+- Don't get stuck thinking that branches are only used as feature branches or issue branches! You can always create a short-lived temporary branch for something small, like shelving an experimental change.
+- If a temporary branch is still too much overhead for you, you can instantly stash your local changes with `git stash`. Restore your stashed changes later with `git stash pop`.
+- Prefer `git add -p` over `git add [FILE]`. This allows you to specify what you want to add to a commit in a more fine-grained manner
+- A very nice alias for editing any earlier commit, without having to manually rebase:
+
+    ```
+    [alias]
+        amend = "!f() { \
+            COMMIT=$(git rev-parse --short \"$1\") && \
+            git commit --fixup \"$COMMIT\" && \
+            GIT_SEQUENCE_EDITOR=true git rebase --autosquash --autostash --interactive "$COMMIT^"; \
+        }; f"
+    ```
+
+    Usage: e.g. `git add -p ...` and then `git amend HEAD~5`. This would add the staged changes to the fifth last commit.
 
 ## Tricks from Winter Term 2024/25
 

03_building_and_packaging/cmake_exercise.md

@@ -4,11 +4,11 @@ In this exercise, we need to fight. Not everything always works smoothly. This i
 
 To get an independent and reproducible environment as common ground, we use and, thus repeat, Docker.
 
-Deadline: **Wednesday, November 27th, 2024, 9:00**
+Deadline: **Wednesday, November 26th, 2025, 9:00**
 
 ## Overview
 
-- The goal of the exercise is to open a pull request from a fork of [the CMake exercise repository](https://github.com/Simulation-Software-Engineering/cmake-exercise-wt2425). Please name your pull request `Add building and container recipes` and assign yourself.
+- The goal of the exercise is to open a pull request from a fork of [the CMake exercise repository](https://github.com/Simulation-Software-Engineering/cmake-exercise). Please name your pull request `Add building and container recipes` and assign yourself.
 - Your pull request should add a `Dockerfile` and a `CMakeLists.txt`, besides some minor changes in `main.cpp`, such as commenting in some code parts.
 - From your pull request, it should be possible to create an executable container. After running the container, it should be possible to `cd` into `cmake-exercise` and then run the `build_and_run.sh` script.
 - Use as many of the currently commented-out additional files, which induce additional dependencies.

timetable.md

@@ -54,3 +54,13 @@
 ## 5.2 – Wed, November 12, 2025
 
 - **90** min.: [Exercise on Packaging a Python Code](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/pypi_exercise.md)
+
+## 6.1 – Wed, November 19, 2025
+
+- **25** min.: Some Linux fundamentals: [slides](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/linux_fundamentals_slides.md), [demo](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/linux_fundamentals_demo.md)
+- **20** min.: Introduction to Make: [slides](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/make_slides.md), [demo](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/make_demo.md)
+- **45** min.: Introduction to CMake: [slides](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/cmake_slides.md), [demo](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/cmake_demo.md)
+
+## 6.2 – Wed, November 19, 2025
+
+- **90** min.: [Exercise: Let's Fight With CMake, Docker, and Some Dependencies](https://github.com/Simulation-Software-Engineering/Lecture-Material/blob/main/03_building_and_packaging/cmake_exercise.md)