mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2025-05-01 20:42:01 +02:00
Add more levels in the new format
This commit is contained in:
parent
065ca2a233
commit
aec32e115c
10 changed files with 22 additions and 16 deletions
levels/top-down
|
@ -1,3 +1,7 @@
|
|||
description = Rebase all branches on top of the main branch, so that the commits are in alphabetical order, and then point the main branch to the top commit.
|
||||
|
||||
[setup]
|
||||
|
||||
git commit --allow-empty -m A
|
||||
git commit --allow-empty -m B
|
||||
git commit --allow-empty -m C
|
||||
|
@ -10,3 +14,7 @@ git switch -c side2 main~2
|
|||
git commit --allow-empty -m F
|
||||
|
||||
git checkout main
|
||||
|
||||
[win]
|
||||
|
||||
diff <(git log --pretty=%s main) <(echo -e "F\nE\nD\nC\nB\nA")
|
|
@ -1 +0,0 @@
|
|||
Rebase all branches on top of the main branch, so that the commits are in alphabetical order, and then point the main branch to the top commit.
|
|
@ -1,9 +0,0 @@
|
|||
git switch side1
|
||||
git rebase main
|
||||
git switch side2
|
||||
git rebase side1
|
||||
git switch main
|
||||
git merge side2
|
||||
|
||||
git reflog expire --expire=all --all
|
||||
git prune
|
|
@ -1 +0,0 @@
|
|||
diff <(git log --pretty=%s main) <(echo -e "F\nE\nD\nC\nB\nA")
|
8
levels/top-down/sandbox
Normal file
8
levels/top-down/sandbox
Normal file
|
@ -0,0 +1,8 @@
|
|||
[setup local]
|
||||
|
||||
git commit --allow-empty -m "1"
|
||||
git commit --allow-empty -m "2"
|
||||
git commit --allow-empty -m "3"
|
||||
git push
|
||||
|
||||
[setup origin]
|
|
@ -1 +1 @@
|
|||
welcome
|
||||
sandbox
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Hiiii!
|
Loading…
Add table
Add a link
Reference in a new issue