From adb8da6288f80902497e97782b9e5b013fdc4d22 Mon Sep 17 00:00:00 2001 From: Lars Frost <larsf@fsmpi.rwth-aachen.de> Date: Tue, 19 Nov 2024 23:24:32 +0100 Subject: [PATCH] Explain ^- and ~-Syntax --- materials/slides/team.typ | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/materials/slides/team.typ b/materials/slides/team.typ index bbb6708..c10a8c8 100644 --- a/materials/slides/team.typ +++ b/materials/slides/team.typ @@ -515,4 +515,11 @@ Content of new incoming changes >>>>>>> incoming_branch", block: true) ] +== Aliases + +=== `^` +- `main^2` - Der zweite Parent vor `main` +=== `~` +- `main~2` - Zwei Commits vor `main`, wobei immer der erste Parent genommen wird + #include "remotes.typ" \ No newline at end of file -- GitLab