合并提交

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
7 changed files with 16 additions and 3 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
@ -1,2 +1 @@
-首页内容
+首页内容
 fdflfjdskljfldskflkdsfds
--- a/store.txt
+++ b/store.txt
@ -2,3 +2,4 @@
 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
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
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
`@ -1,2 +1 @@`
	`首页内容`	`首页内容`
	`fdflfjdskljfldskflkdsfds`