Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-05-01 20:42:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add more congrats, missing cards

Browse source
This commit is contained in:
Sebastian Morr 2020-10-22 17:27:54 +02:00
parent 5d59623392
commit af0d7928ef
10 changed files with 82 additions and 25 deletions
levels/time-machine
rebase

10
levels/time-machine/rebase
View file

@ -1,10 +1,12 @@
title = No parallels allowed
title = Rebasing
[description]
Okay - turns out that saving time in the morning by utilizing parallel universes is against the regulations of the International Time Travel Association. You'll have to do your tasks in sequence after all.
See the "rebase" card? It takes a specified commit, and puts the events in your current timeline on top of the specified one! This way, make a clean, linear timeline where you visit all three shops.
See the "rebase" card? When you drag it to a commit, it will put the events in your current timeline on top of the specified one! This way, make a clean, linear timeline where you visit all three shops.
Again, we want to make that our base reality - the "main" tag should point to that timeline!
[setup]
@ -72,3 +74,7 @@ git checkout baguette
[win]
{ git show main:you | grep "You have a baguette"; } && { git show main:you | grep "You have coffee"; } && { git show main:you | grep "You have a donut"; } && { test "$(git log main --oneline | wc -l)" -eq 7; }
[congrats]
Notice how the other timelines and commits are still there - if anything goes wrong, you can also travel back to them.