diff --git a/levels/changing-the-past/rebase b/levels/changing-the-past/rebase index 748bdb3..d52216c 100644 --- a/levels/changing-the-past/rebase +++ b/levels/changing-the-past/rebase @@ -76,6 +76,7 @@ git checkout --detach main [win] +# Order all tree branches into one and move the main branch ref { git show main:you | grep "You ate.*baguette"; } && { git show main:you | grep "You drank.*coffee"; } && { git show main:you | grep "You ate.*donut"; } && { test "$(git log main --oneline | wc -l)" -eq 7; } [congrats] diff --git a/levels/changing-the-past/reorder b/levels/changing-the-past/reorder index 1d869f8..e97accf 100644 --- a/levels/changing-the-past/reorder +++ b/levels/changing-the-past/reorder @@ -70,6 +70,7 @@ git commit -am "Put on shirt" [win] +# Reorder the commits to dress yourself in the correct way { git log main --oneline | grep -Pz "shoes[\s\S]*pants[\s\S]*underwear"; } && { test "$(git log main --oneline | wc -l)" -eq 5; } [congrats]