Merge branch 'master' of git@gitlab.sd-zeus.com:testcii/GitTestMainProject.git

93ed88ed · 曾程 · 7ab180de · b258bdb1 · 93ed88ed · e22bde6e
Commit 93ed88ed authored Apr 15, 2023 by 曾程
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

.gitmodules .gitmodules +3 -3

GitTestSubProject2 GitTestSubProject2 +1 -1

学习git分支.txt 学习git分支.txt +4 -2

No files found.
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "GitTestSubProject2"]
 	path = GitTestSubProject2
 	url = git@gitlab.sd-zeus.com:testcii/GitTestSubProject2.git
-[submodule "GitTestSubProject1"]
-	path = GitTestSubProject1
-	url = git@gitlab.sd-zeus.com:testcii/GitTestSubProject1.git
+[submodule "GitTestSubproject1"]
+	path = GitTestSubproject1
+	url = git@gitlab.sd-zeus.com:testcii/GitTestSubproject1.git
--- a/GitTestSubProject2 @ e22bde6e
+++ b/GitTestSubProject2 @ e22bde6e
-Subproject commit 3f02e988466ad8b97e9ccc5ead3d2b0549103492
+Subproject commit e22bde6e5175e72591209729c2f00b1ae65ccd58
--- a/学习git分支.txt
+++ b/学习git分支.txt
@@ -11,4 +11,6 @@
 蠟兀
 ZHANGLU
 zz
-更新20221103
\ No newline at end of file
+뫘劤20221103
+부亶쌤
+33333
\ No newline at end of file