From 4255808a2ee7fe2c85a199e0587bddb8449bc7f4 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Mon, 7 Jul 2025 20:03:37 +0800 Subject: [PATCH 01/20] no message --- 冲突.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 冲突.txt diff --git a/冲突.txt b/冲突.txt new file mode 100644 index 0000000..e69de29 From 926d82cddb8462a6251994e0ebd8e34737806004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= Date: Mon, 7 Jul 2025 20:05:08 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'=E5=86=B2=E7=AA=81.?= =?UTF-8?q?txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 冲突.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/冲突.txt b/冲突.txt index e69de29..7f88605 100644 --- a/冲突.txt +++ b/冲突.txt @@ -0,0 +1 @@ +远程修改 \ No newline at end of file From d3fcbeb2be13f62b98171d5218e8e12955a8ae62 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Mon, 7 Jul 2025 20:05:37 +0800 Subject: [PATCH 03/20] no message --- 冲突.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/冲突.txt b/冲突.txt index e69de29..a9ffe5a 100644 --- a/冲突.txt +++ b/冲突.txt @@ -0,0 +1 @@ +本地修改 \ No newline at end of file From 633f3dec62be41e66fe03ee51623ade504ad0fab Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Tue, 8 Jul 2025 08:22:37 +0800 Subject: [PATCH 04/20] no message --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..209110f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +需要忽略.txt From 363b4bf2359218607a16871e9fb292dd33c8b4e7 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Tue, 8 Jul 2025 08:39:46 +0800 Subject: [PATCH 05/20] no message --- .gitignore | 1 + patch.diff | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 patch.diff diff --git a/.gitignore b/.gitignore index 209110f..a66fbe0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ 需要忽略.txt +停止跟踪.txt diff --git a/patch.diff b/patch.diff new file mode 100644 index 0000000..d6f7066 --- /dev/null +++ b/patch.diff @@ -0,0 +1,20 @@ +From 633f3dec62be41e66fe03ee51623ade504ad0fab Mon Sep 17 00:00:00 2001 +From: "GYP\\54194" +Date: Tue, 8 Jul 2025 08:22:37 +0800 +Subject: [PATCH] no message + +--- + .gitignore | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 .gitignore + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..209110f +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1 @@ ++需要忽略.txt +-- +2.50.0.windows.2 + From baa091f19e5c63c2589ec6842dd4657949d6efc2 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Tue, 8 Jul 2025 08:42:09 +0800 Subject: [PATCH 06/20] no message --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index a66fbe0..d3cf9bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ 需要忽略.txt +<<<<<<< HEAD 停止跟踪.txt +======= +>>>>>>> no message From 3b938a9b44a7c39f6cd11fe835b47921346400ed Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Tue, 8 Jul 2025 08:42:54 +0800 Subject: [PATCH 07/20] no message --- 新建 文本文档.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 新建 文本文档.txt diff --git a/新建 文本文档.txt b/新建 文本文档.txt new file mode 100644 index 0000000..e69de29 From 2af53ce6884ad750c1c7c13456382e2358549cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= Date: Tue, 8 Jul 2025 08:43:29 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'test2.txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test2.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test2.txt diff --git a/test2.txt b/test2.txt deleted file mode 100644 index d800886..0000000 --- a/test2.txt +++ /dev/null @@ -1 +0,0 @@ -123 \ No newline at end of file From 3424164c06fa3448b788a61f2af91767df73f73e Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Tue, 8 Jul 2025 09:22:27 +0800 Subject: [PATCH 09/20] no message --- patch.diff | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/patch.diff b/patch.diff index d6f7066..14e1ad2 100644 --- a/patch.diff +++ b/patch.diff @@ -1,20 +1,22 @@ -From 633f3dec62be41e66fe03ee51623ade504ad0fab Mon Sep 17 00:00:00 2001 -From: "GYP\\54194" -Date: Tue, 8 Jul 2025 08:22:37 +0800 -Subject: [PATCH] no message +From 926d82cddb8462a6251994e0ebd8e34737806004 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= +Date: Mon, 7 Jul 2025 20:05:08 +0800 +Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'=E5=86=B2=E7=AA=81.txt'?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit --- - .gitignore | 1 + + 冲突.txt | 1 + 1 file changed, 1 insertion(+) - create mode 100644 .gitignore -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..209110f ---- /dev/null -+++ b/.gitignore +diff --git a/冲突.txt b/冲突.txt +index e69de29..7f88605 100644 +--- a/冲突.txt ++++ b/冲突.txt @@ -0,0 +1 @@ -+需要忽略.txt ++远程修改 +\ No newline at end of file -- 2.50.0.windows.2 From e9599109efd70cdf8e56f7510cd25897aea074e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= Date: Wed, 9 Jul 2025 08:25:59 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20'=E9=87=8D=E7=BD=AE.?= =?UTF-8?q?txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 重置.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 重置.txt diff --git a/重置.txt b/重置.txt new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/重置.txt @@ -0,0 +1 @@ +1 \ No newline at end of file From 0ab7e52938da394d54e156ef7c52a50faa935670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E9=B9=8F=20=E9=AB=98?= Date: Wed, 9 Jul 2025 08:26:14 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'=E9=87=8D=E7=BD=AE.?= =?UTF-8?q?txt'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 重置.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/重置.txt b/重置.txt index 56a6051..d8263ee 100644 --- a/重置.txt +++ b/重置.txt @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file From b7c37e44764ffa4f05488e142eb5b67543580c41 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Wed, 9 Jul 2025 08:28:21 +0800 Subject: [PATCH 12/20] no message --- 重置.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/重置.txt b/重置.txt index d8263ee..3993838 100644 --- a/重置.txt +++ b/重置.txt @@ -1 +1,2 @@ -2 \ No newline at end of file +2 +本地修改 \ No newline at end of file From af563383b971d40fa139cc9d0038ffafd5615aa9 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Wed, 9 Jul 2025 08:29:27 +0800 Subject: [PATCH 13/20] no message --- 重置.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/重置.txt b/重置.txt index 3993838..56a6051 100644 --- a/重置.txt +++ b/重置.txt @@ -1,2 +1 @@ -2 -本地修改 \ No newline at end of file +1 \ No newline at end of file From 6d02bf5afa1c16d6f6c65b530691a55adfad8e3f Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Wed, 9 Jul 2025 08:31:29 +0800 Subject: [PATCH 14/20] no message --- 重置.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/重置.txt b/重置.txt index 56a6051..e331688 100644 --- a/重置.txt +++ b/重置.txt @@ -1 +1,2 @@ -1 \ No newline at end of file +1 +回滚 \ No newline at end of file From de81eb633b82acbf202ba855b420678febc61044 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Wed, 9 Jul 2025 08:31:39 +0800 Subject: [PATCH 15/20] Revert "no message" This reverts commit 6d02bf5afa1c16d6f6c65b530691a55adfad8e3f. --- 重置.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/重置.txt b/重置.txt index e331688..56a6051 100644 --- a/重置.txt +++ b/重置.txt @@ -1,2 +1 @@ -1 -回滚 \ No newline at end of file +1 \ No newline at end of file From 0b5f8262e98ec31fa56d197faa2d909e2e359d5b Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Wed, 9 Jul 2025 09:30:02 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E4=B8=BB=E5=88=86=E6=94=AF=E8=A1=A5?= =?UTF-8?q?=E4=B8=81=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 补丁测试.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 补丁测试.txt diff --git a/补丁测试.txt b/补丁测试.txt new file mode 100644 index 0000000..e69de29 From 86c5678edece132d339a28d01e6e306f5d1baece Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Fri, 11 Jul 2025 15:58:31 +0800 Subject: [PATCH 17/20] no message --- 重置.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/重置.txt b/重置.txt index 56a6051..7a754f4 100644 --- a/重置.txt +++ b/重置.txt @@ -1 +1,2 @@ -1 \ No newline at end of file +1 +2 \ No newline at end of file From bfca55769a41cb8806f7b5bff505a704ff6edb63 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Fri, 11 Jul 2025 15:58:55 +0800 Subject: [PATCH 18/20] Revert "no message" This reverts commit 86c5678edece132d339a28d01e6e306f5d1baece. --- 重置.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/重置.txt b/重置.txt index 7a754f4..56a6051 100644 --- a/重置.txt +++ b/重置.txt @@ -1,2 +1 @@ -1 -2 \ No newline at end of file +1 \ No newline at end of file From 1d3f7d41e9b25b582c8b45470d7b9a6e24a0389a Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Fri, 11 Jul 2025 16:00:04 +0800 Subject: [PATCH 19/20] no message --- 重置.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/重置.txt b/重置.txt index 56a6051..7a754f4 100644 --- a/重置.txt +++ b/重置.txt @@ -1 +1,2 @@ -1 \ No newline at end of file +1 +2 \ No newline at end of file From daf426a250894f2aabc783301ebea22ec8522179 Mon Sep 17 00:00:00 2001 From: "GYP\\54194" Date: Fri, 11 Jul 2025 16:02:12 +0800 Subject: [PATCH 20/20] no message --- 重置.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/重置.txt b/重置.txt index 7a754f4..863349c 100644 --- a/重置.txt +++ b/重置.txt @@ -1,2 +1,3 @@ 1 -2 \ No newline at end of file +2 +new