116 Commits

Author SHA1 Message Date
f2f7758e95 neuen Änderung 2025-02-21 16:45:25 +01:00
6cba59943b hahaha 2025-02-21 16:38:35 +01:00
80806f1b93 hahaha 2025-02-21 16:38:09 +01:00
a6c47136b2 test 2025-02-21 16:36:23 +01:00
1ccd146d3a adrian_s gelöscht 2025-02-21 15:34:38 +00:00
27a7ccf88f readme.md aktualisiert 2025-02-21 15:32:15 +00:00
0536f86879 test 2025-02-21 16:30:36 +01:00
a4d45b85ae Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:27:55 +01:00
Stefan Möller
e46e5a5ef9 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:26:31 +01:00
ac745fb51b Merge pull request 'my_branch' (#2) from my_branch into main
Reviewed-on: #2
2025-02-21 15:26:30 +00:00
Stefan Möller
854d74bbd6 Add gitignore 2025-02-21 16:26:29 +01:00
d29ba40ebd Merge branch 'tiflabranch' 2025-02-21 16:25:12 +01:00
Leo Schlegel
e76d1acd63 delete 2025-02-21 16:24:40 +01:00
Leo Schlegel
525d9c653d new file 2025-02-21 16:24:11 +01:00
Leo Schlegel
a2aaacf278 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:23:46 +01:00
Leo Schlegel
d3adf005b2 gitignoer 2025-02-21 16:23:35 +01:00
DanielV
f96ad6d4d0 Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch 2025-02-21 16:23:27 +01:00
DanielV
6514c058b1 Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch 2025-02-21 16:22:48 +01:00
e6c0dc1dd6 Test Änderung 2025-02-21 16:22:36 +01:00
abf8f58db5 doch nicht 2025-02-21 16:21:10 +01:00
e146686ee1 Lets play 2025-02-21 16:19:14 +01:00
Stefan Möller
40ca9a520a Merge branch 'feature/stefan' 2025-02-21 16:17:12 +01:00
e4023db286 gelöscht 2025-02-21 16:16:38 +01:00
cf05e2a64a Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:15:29 +01:00
c25845de1d hallo 2025-02-21 16:15:21 +01:00
Stefan Möller
8d4abb7b4e create stefan file 2025-02-21 16:13:34 +01:00
59951f5dfc Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:13:11 +01:00
0562430628 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:12:42 +01:00
Janek Schultes
c7bc9db676 test 2025-02-21 16:12:26 +01:00
b8b59759be Ich will hier aus 2025-02-21 16:12:20 +01:00
017ef4e4e5 Änderung 2025-02-21 16:11:56 +01:00
841478c4cc Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:11:41 +01:00
88f943991f Wunschliste 2025-02-21 16:11:02 +01:00
50c82c778f Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:10:32 +01:00
30693bb53c Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:08:33 +01:00
bc88afc9f4 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:08:08 +01:00
6e8d6516b3 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:07:57 +01:00
edbc58f29c neu 2025-02-21 16:07:54 +01:00
80052d6f28 Halllo 2025-02-21 16:07:49 +01:00
DanielV
f6a1c68a7b hahaha 2025-02-21 16:07:41 +01:00
ef4f3c58ed Änderung 2025-02-21 16:07:19 +01:00
3cc458995e Wunschliste 2025-02-21 16:07:13 +01:00
7ae4b73760 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:59 +01:00
DanielV
e8d2d69091 Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis into my_branch 2025-02-21 16:06:41 +01:00
237ed837db Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:34 +01:00
AdrianSommer
ede8449854 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:33 +01:00
Leo Schlegel
4ed3855858 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:32 +01:00
AdrianSommer
a314ad9e2a Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:29 +01:00
Leo Schlegel
bcffd6dc97 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:23 +01:00
0304959f4c Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:21 +01:00
Leo Schlegel
9ffbe5d740 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:20 +01:00
de7729d3d8 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:19 +01:00
AdrianSommer
0c2e8e74da Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:17 +01:00
f3949cfa07 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:12 +01:00
d6f11abca2 ? 2025-02-21 16:06:04 +01:00
cd09fa826a Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:02 +01:00
40f6df15cf wieder da 2025-02-21 15:06:02 +00:00
5b89079238 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:06:02 +01:00
Leo Schlegel
a7677c7ea9 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:05:58 +01:00
AdrianSommer
0aa9c2ab4b Shellshocker lets go 2025-02-21 16:05:55 +01:00
a75b95c18d new commit 2025-02-21 16:05:53 +01:00
79848e3d67 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:05:36 +01:00
5ab54fbf49 Hallo 2025-02-21 15:05:37 +00:00
a45d88f580 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:05:32 +01:00
cda79e15cc Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:05:27 +01:00
f13e43167b Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:05:17 +01:00
6bf6c39d7b Both 2025-02-21 16:05:10 +01:00
5f895fc4e8 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:05:03 +01:00
Leo Schlegel
7ebfcf48cd moin 2025-02-21 16:04:54 +01:00
1626de32b7 Alles weg 2025-02-21 15:04:52 +00:00
567e7a5309 Neuer Ordner mit File 2025-02-21 16:04:52 +01:00
b9795bb86a Hallo Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:04:34 +01:00
AdrianSommer
48d3a7176a Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:04:33 +01:00
AdrianSommer
250e781382 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:04:29 +01:00
74650634d6 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:03:56 +01:00
DanielV
d5d9f19ade changed readme 2025-02-21 16:03:54 +01:00
c0f4fa1ff7 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:03:52 +01:00
AdrianSommer
bbaa59d2f2 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:03:15 +01:00
829eebcc91 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:03:10 +01:00
AdrianSommer
994fea67aa Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:03:05 +01:00
8e72bc9cdf test 2025-02-21 16:03:01 +01:00
03649c7c29 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:02:40 +01:00
AdrianSommer
8ffd205515 blabla 2025-02-21 16:02:22 +01:00
5e00d0f273 Okay 2025-02-21 16:02:20 +01:00
dd4a6975ea adrian_s aktualisiert 2025-02-21 15:02:18 +00:00
Leo Schlegel
20d0c8f925 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:02:04 +01:00
Leo Schlegel
ebd54a0776 ka 2025-02-21 16:01:55 +01:00
75555c2912 test 2025-02-21 16:01:47 +01:00
7fba557825 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:01:38 +01:00
6370ce8904 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis
Please enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic branch.

 Lines starting with '#' will be ignored, and an empty message aborts
2025-02-21 16:01:35 +01:00
9758b6e0c6 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:01:07 +01:00
5587af0b10 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:01:04 +01:00
eb2b297ba4 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:00:55 +01:00
a511edc44b Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:00:45 +01:00
145ba1fd44 KingCommit 2025-02-21 16:00:21 +01:00
e45095eeb9 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:00:20 +01:00
77f783de9b Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:00:15 +01:00
d3e3f440e2 Bewertung 2025-02-21 16:00:07 +01:00
6328bfaa5e Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 16:00:01 +01:00
AdrianSommer
ddfce1f9cc Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:59:46 +01:00
7fa4094637 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:59:41 +01:00
AdrianSommer
11c4dfeee9 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:59:36 +01:00
AdrianSommer
1d24cd16be Hallo gesagt 2025-02-21 15:59:22 +01:00
8781941938 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:59:12 +01:00
DanielV
b5f4c47d4c Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:59:10 +01:00
8bc2b1dc47 Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:59:01 +01:00
Janek Schultes
51d41ec2bf Merge branch 'main' of https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:58:45 +01:00
694c4a2200 neuDat 2025-02-21 15:58:37 +01:00
307785939e Schade 2025-02-21 15:58:21 +01:00
DanielV
63f4eb7660 Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:57:41 +01:00
Janek Schultes
459963d0e6 nein 2025-02-21 15:57:15 +01:00
2790b70f94 annkatrin commit 2025-02-21 15:57:05 +01:00
DanielV
7364feaf93 Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:56:54 +01:00
DanielV
717d56111e Merge https://gitea.hb.dhbw-stuttgart.de/Gordrin/git-labor-praxis 2025-02-21 15:55:51 +01:00
ea1ab115a1 Das ist ein Test lan 2025-02-21 15:55:25 +01:00
DanielV
22a58cf910 dv 2025-02-21 15:46:05 +01:00
16 changed files with 51 additions and 7 deletions

34
.gitignore vendored Normal file
View File

@@ -0,0 +1,34 @@
# Prerequisites
*.d
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
*.smod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
# textfiles
*.txt

View File

@@ -1 +1,3 @@
Peter Pan!
Peter Pan!
Halloooooo
Hallo

0
King.txt Normal file
View File

1
Leo
View File

@@ -1 +0,0 @@
ich bin Leo

0
Test1/Test123 Normal file
View File

View File

@@ -1 +0,0 @@
Hello there!

1
binder.txt Normal file
View File

@@ -0,0 +1 @@
Hallo

0
dv/dv.txt Normal file
View File

0
hallo+ Normal file
View File

5
hehehe Normal file
View File

@@ -0,0 +1,5 @@
hihihi
hlhlhl
__ __ __
\__/ \__/ \__

1
janek
View File

@@ -1,2 +1,3 @@
das ist ein test
das ist noch ein test

3
jonas
View File

@@ -1,3 +0,0 @@
Schreibgeschützt
So schreibgeschützt ist das gar nicht

1
leo.txt Normal file
View File

@@ -0,0 +1 @@
Ich bin Leo

View File

@@ -1,2 +1,2 @@
DAS IST EINE README
Okay
hehehe hab den branch geändert

0
stefan.md Normal file
View File

5
tifla.txt Normal file
View File

@@ -0,0 +1,5 @@
test
ädnerung
test
ädnerung