合并提交

feat: 测试vim配置是否生效
Merge branch 'dev'
2024-06-26 01:01:41 +08:00 · 2024-06-25 22:39:35 +08:00 · 2024-06-25 18:56:55 +08:00 · 2024-06-25 10:52:22 +08:00 · 2024-06-25 10:51:12 +08:00 · 2024-06-23 06:05:29 +08:00
10 changed files with 28 additions and 1 deletions
--- a/GPG-TEST.TXT
+++ b/GPG-TEST.TXT
@ -0,0 +1 @@
+sdfdsfdsfdsfsd
--- a/fetch-test.txt
+++ b/fetch-test.txt
@ -1 +1,4 @@
+sdflkdsjfljsdkjfsdjfdsjfsdlkj
 这是一个测试文件，用于测试fetch功能
+fdsfsdf
+sdjfldkjslfkjsdlkjflksdjfklsdfsdf
--- a/index.txt
+++ b/index.txt
@ -0,0 +1 @@
+首页内容
--- a/login.txt
+++ b/login.txt
@ -0,0 +1,5 @@
+登录模块
+DUFIDSFSDLFJLSDFJLDSKF
+fsdljflkdsjf
+ldsjfldsjflkjsdlkjflkds
+sdfjlsdjf
--- a/main-content.txt
+++ b/main-content.txt
@ -0,0 +1,2 @@
+我是在主分支上面开发的内容
+添加新功能
--- a/store.txt
+++ b/store.txt
@ -0,0 +1,5 @@
+商城功能
+FSLDKJFLKDSJFLJFJDSLFJLSDFLSDJFLDSJFDF
+fjldskjflsdjflsdjlfds
+fjldskjflsdjflsdjlfdfdsfdsfdsfdss
+i am LouisFonda, i was a student, i like to coding.
--- a/test-pgp-new-key.txt
+++ b/test-pgp-new-key.txt
@ -0,0 +1 @@
+test gpg new key [s]
--- a/test.txt
+++ b/test.txt
@ -1 +1,3 @@
-我是测试文件，用于测试gi status。
+我是测试文件，用于测试gi status。测试--detach
+我是测试问津用于测试是否可以用于gpg签名。
+这行内容用于测试git commit --amend.
--- a/test2.txt
+++ b/test2.txt
@ -0,0 +1,6 @@
+这行内容用来测试get commit --amend
+第一条内容
+第二条内容
+第三条内容
+这是第三次提交
+范德萨范德萨发s
--- a/version1-content.txt
+++ b/version1-content.txt
@ -0,0 +1 @@
+feat: 修复v1.0的bug
Author	SHA1	Message	Date
LouisFonda	a2ea53d497	合并提交	2024-06-26 01:01:41 +08:00
yigencong	21f9f1f892	feat: 测试vim配置是否生效	2024-06-25 22:39:35 +08:00
yigencong	1bfa3d4682	Merge branch 'dev'	2024-06-25 18:56:55 +08:00
yigencong	a62e8d9393	feta: 测试rebase操作	2024-06-25 10:52:22 +08:00
yigencong	350297a97f	feat: 测试git commit --amend	2024-06-25 10:51:12 +08:00
yigencong	70131f6c50	feat: 测试gpg签名	2024-06-23 06:05:29 +08:00
yigencong	ed32a78d23	feat: 测试switch --detach	2024-06-23 06:05:29 +08:00
yigencong	7303978ed3	Your commit message	2024-06-23 01:10:38 +08:00
yigencong	35cfda8d51	signed commit	2024-06-22 20:20:28 +08:00
yigencong	d12c618f46	feat:fdlsjfldksjf	2024-06-22 16:40:10 +08:00
yigencong	746039ae21	feat:fdlsjfldksjf	2024-06-22 03:34:14 +08:00
LouisFonda	62df693e91	feat: flsdkjfldskjflds	2024-06-22 03:34:14 +08:00
yigencong	32ed1698f2	feat: fsdjflkds	2024-06-22 03:34:14 +08:00
LouisFonda	b66487ef7e	feat: sfldjfdslfd	2024-06-22 03:34:14 +08:00
LouisFonda	c2a582a6e5	feat: flsdkjfldskjflds	2024-06-22 02:53:17 +08:00
yigencong	8fe482d541	feat: fsdjflkds	2024-06-22 02:26:33 +08:00
yigencong	c1232226cf	Merge branch 'dev' of ssh://192.168.31.208:222/yigencong/git-pro into dev	2024-06-22 02:24:16 +08:00
LouisFonda	9530545253	feat: sfldjfdslfd	2024-06-22 02:03:47 +08:00
LouisFonda	21f077258d	feat: fdsljfdsf	2024-06-22 02:02:57 +08:00
LouisFonda	ebeac6801c	feat: one of store is good	2024-06-21 17:20:50 +08:00
LouisFonda	f315608b48	feat: add one part of store	2024-06-21 17:19:03 +08:00
LouisFonda	6f69301764	feat: add store	2024-06-21 17:11:57 +08:00
yigencong	70747224aa	feat: 添加商城功能	2024-06-21 02:57:23 +08:00
yigencong	0fa30a244e	Merge branch 'version1'	2024-06-20 21:57:29 +08:00
yigencong	f82139b925	fix: 修复v1.0的bug	2024-06-20 21:42:19 +08:00
yigencong	5f3ad93098	feat: 添加首页内容	2024-06-20 21:32:22 +08:00
yigencong	7b3496af08	feat: 添加登录模块	2024-06-20 21:31:25 +08:00
yigencong	7ee503a319	feat: 在version1分支上添加新功能	2024-06-20 07:07:08 +08:00
yigencong	ace9b4400c	feat: 给主分支添加新功能	2024-06-20 07:05:41 +08:00
yigencong	ed62c6f1bf	feat: 主分支内容	2024-06-20 07:04:57 +08:00