From 075583d7e02b31ea912bc9e0fb7ee75654142064 Mon Sep 17 00:00:00 2001 From: "taco.cato" Date: Sun, 15 Sep 2024 11:42:15 +0200 Subject: [PATCH 1/8] helloo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e69de29..45b983b 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +hi From c8239b5886df839da3c452f3abd0474cddcc1920 Mon Sep 17 00:00:00 2001 From: Leo Chen <01adern.feld@icloud.com> Date: Sun, 15 Sep 2024 11:48:27 +0200 Subject: [PATCH 2/8] Very meaningful message --- hellopeople.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hellopeople.txt diff --git a/hellopeople.txt b/hellopeople.txt new file mode 100644 index 0000000..e965047 --- /dev/null +++ b/hellopeople.txt @@ -0,0 +1 @@ +Hello From 851be27fc03c6b7db5e3d6a377907a3fd4976e28 Mon Sep 17 00:00:00 2001 From: Cheng Zhong Date: Sun, 15 Sep 2024 11:48:39 +0200 Subject: [PATCH 3/8] hello! --- hello.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 0000000..c2cb227 --- /dev/null +++ b/hello.txt @@ -0,0 +1 @@ +test from cheng From 9cdf3bb3ee016bcd3b201dc3d402fbfb480f9840 Mon Sep 17 00:00:00 2001 From: Leo Chen <01adern.feld@icloud.com> Date: Sun, 15 Sep 2024 11:49:12 +0200 Subject: [PATCH 4/8] Very meaningful message --- hellopeople.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 hellopeople.txt diff --git a/hellopeople.txt b/hellopeople.txt deleted file mode 100644 index e965047..0000000 --- a/hellopeople.txt +++ /dev/null @@ -1 +0,0 @@ -Hello From 884c061146a042ebad2b0b3246c1d048b878df34 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:50:18 +0200 Subject: [PATCH 5/8] added back the important files I added earlier --- READMEINSTEAD.md | 13 +++++++++++++ anotherfileagain.txt | 1 + 2 files changed, 14 insertions(+) create mode 100644 READMEINSTEAD.md create mode 100644 anotherfileagain.txt diff --git a/READMEINSTEAD.md b/READMEINSTEAD.md new file mode 100644 index 0000000..f3a4e32 --- /dev/null +++ b/READMEINSTEAD.md @@ -0,0 +1,13 @@ +# Hello World +git commit -a -m "Message" +This command adds all modified files, but not new ones, to a commit immediately. + +If someone else already commit smth, pull it with +git pull -r +Now you start resolving conflicts. If there's a conflict, you gotta deal with it. Keep doing that till you're done +--> Happiness +continue with "git rebase --continue" +then you can pmossibly change the commit message +then you can push +git log +exists as a log of what happened \ No newline at end of file diff --git a/anotherfileagain.txt b/anotherfileagain.txt new file mode 100644 index 0000000..6d20e91 --- /dev/null +++ b/anotherfileagain.txt @@ -0,0 +1 @@ +hi there \ No newline at end of file From 51ffabbb689c76f1b65f5916cddbafbb5bbef3b6 Mon Sep 17 00:00:00 2001 From: Luca Versari Date: Sun, 15 Sep 2024 11:59:54 +0200 Subject: [PATCH 6/8] Awesome commit (#2) Co-authored-by: Luca Versari Reviewed-on: https://git.soi.ch/veluca/git-tutorial/pulls/2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45b983b..b14df64 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -hi +Hi From f66e04ce24f4cfa961c5b52fdfd142ea906efa2e Mon Sep 17 00:00:00 2001 From: ferdinand Date: Sun, 15 Sep 2024 12:00:42 +0200 Subject: [PATCH 7/8] blub --- hi.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hi.txt diff --git a/hi.txt b/hi.txt new file mode 100644 index 0000000..10ddd6d --- /dev/null +++ b/hi.txt @@ -0,0 +1 @@ +Hello! From ddebb519d81a4ba9f3ba84bfda2caad7d7968f3c Mon Sep 17 00:00:00 2001 From: ferdinand Date: Sun, 15 Sep 2024 12:00:42 +0200 Subject: [PATCH 8/8] blub --- hi.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hi.txt diff --git a/hi.txt b/hi.txt new file mode 100644 index 0000000..10ddd6d --- /dev/null +++ b/hi.txt @@ -0,0 +1 @@ +Hello!