Two top-down levels

This commit is contained in:
Sebastian Morr 2020-09-22 19:43:02 +02:00
parent 2a890c7f8a
commit 04f4898417
9 changed files with 44 additions and 0 deletions

View file

@ -0,0 +1,13 @@
So you've been working on a project for a while, and decide you want to put it in a Git repository.
Here's how to do it! First, you initialize a new Git repository in your current directory:
git init
Then say that you want to record the current state of all files:
git add .
And then you make a commit, which gives the current state a description, a date, and your name:
git commit

View file

@ -0,0 +1,2 @@
git add .
git commit -m "Initial commit"

View file

@ -0,0 +1,4 @@
mkdir recipes
echo -e "blueberries\nflour" > recipes/blueberry_cake.txt
echo -e "water\ncarrots" > recipes/carrot soup.txt
echo "Very good recipes!" > README.md

View file

@ -0,0 +1 @@
test "$(git rev-parse HEAD^{tree})" = 1e02e3151284d0e22cd9b07ca5c5dbae2f3cb521

View file

@ -0,0 +1 @@
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.

View file

@ -0,0 +1,9 @@
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

View file

@ -0,0 +1,12 @@
git commit --allow-empty -m A
git commit --allow-empty -m B
git commit --allow-empty -m C
git switch -c side1 main~1
git commit --allow-empty -m D
git commit --allow-empty -m E
git switch -c side2 main~2
git commit --allow-empty -m F
git checkout main

View file

@ -0,0 +1 @@
diff <(git log --pretty=%s main) <(echo -e "F\nE\nD\nC\nB\nA")

View file

@ -193,6 +193,7 @@ size_flags_vertical = 3
repository_path = NodePath("../../Repositories/ActiveRepository")
[node name="Test" type="Node2D" parent="."]
visible = false
script = ExtResource( 9 )
[node name="TCPServer" type="Node" parent="Test"]