From c0683ff1fb7753c1d20262a7b73df552cf5f5f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 02:34:23 +0800 Subject: [PATCH 01/12] feat:a.txt --- a.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 a.txt diff --git a/a.txt b/a.txt new file mode 100644 index 0000000..3516331 --- /dev/null +++ b/a.txt @@ -0,0 +1,2 @@ +git测试 + -- Gitee From 5db074b62c36c00f17383787c78b3928d4e3eadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 02:39:55 +0800 Subject: [PATCH 02/12] feat:README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 6e9e88c..792143d 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,13 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config +--- + +``` +git技术 +``` + +--- --- --- -- Gitee From 0a3d241365eddcb9ae23aa5d277829d46bd8ecf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 02:51:27 +0800 Subject: [PATCH 03/12] feat:README.md,B --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 792143d..5deaad0 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,10 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config git技术 ``` +--- + +git技术B +--- --- --- -- Gitee From 0ee44c792e6a500582dd64793dd271eddfb18264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 02:52:40 +0800 Subject: [PATCH 04/12] feat:README.md,B --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5deaad0..0d99384 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config --- +<<<<<<< HEAD ``` git技术 ``` @@ -36,6 +37,8 @@ git技术B --- --- +======= +>>>>>>> parent of 5db074b (feat:README.md) --- -- Gitee From ddb4c8f2ca520d1cb1f922791a10951e5a916e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 03:20:58 +0800 Subject: [PATCH 05/12] feat:README.md,5 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0d99384..58be5f5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config --- -<<<<<<< HEAD ``` git技术 ``` @@ -35,10 +34,11 @@ git技术 git技术B --- --- +``` +git_5 +``` --- -======= ->>>>>>> parent of 5db074b (feat:README.md) --- -- Gitee From 413e87560b770394bc0e112fdc851ab880f1db59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 03:24:29 +0800 Subject: [PATCH 06/12] feat:README.md,6 --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 58be5f5..decd165 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,11 @@ git_5 --- --- +``` +git_6 +``` + +--- -- Gitee From a8ab2cc8877bca720d94fe0d81e4d986ff83623d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=94=A6=E6=B6=9B?= <1523628637@163.com> Date: Fri, 6 Sep 2024 03:25:15 +0800 Subject: [PATCH 07/12] Revert "feat:README.md,5" revert to ddb4 This reverts commit ddb4c8f2ca520d1cb1f922791a10951e5a916e8d. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index decd165..efde82a 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config --- +<<<<<<< HEAD ``` git技术 ``` @@ -34,11 +35,10 @@ git技术 git技术B --- --- -``` -git_5 -``` --- +======= +>>>>>>> parent of 5db074b (feat:README.md) --- ``` git_6 -- Gitee From ddbcabac2d7ff6651db0c920b43f8d853caf3ead Mon Sep 17 00:00:00 2001 From: "jintao.wang" <15236286736@163.com> Date: Fri, 6 Sep 2024 09:44:09 +0800 Subject: [PATCH 08/12] feat:git_7 --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index efde82a..9f42478 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config --- -<<<<<<< HEAD ``` git技术 ``` @@ -37,13 +36,16 @@ git技术B --- --- -======= ->>>>>>> parent of 5db074b (feat:README.md) --- ``` git_6 ``` +``` +git_7 +``` +--- + --- -- Gitee From 20fface98271ad7d7a5014acfd5074d7aa172e3f Mon Sep 17 00:00:00 2001 From: "jintao.wang" <15236286736@163.com> Date: Fri, 6 Sep 2024 09:44:58 +0800 Subject: [PATCH 09/12] =?UTF-8?q?feat:a.txt,git=20revert=E5=AD=A6=E4=B9=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/a.txt b/a.txt index 3516331..7171531 100644 --- a/a.txt +++ b/a.txt @@ -1,2 +1,6 @@ git测试 +git revert学习 + + + -- Gitee From 3a77bb6c1057dbdab81f16a9166993b57ad7f1ac Mon Sep 17 00:00:00 2001 From: "jintao.wang" <15236286736@163.com> Date: Fri, 6 Sep 2024 09:45:32 +0800 Subject: [PATCH 10/12] =?UTF-8?q?Revert=20"feat:git=5F7"=20=E6=92=A4?= =?UTF-8?q?=E9=94=80feat:git=5F7=20This=20reverts=20commit=20ddbcabac2d7ff?= =?UTF-8?q?6651db0c920b43f8d853caf3ead.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9f42478..efde82a 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config --- +<<<<<<< HEAD ``` git技术 ``` @@ -36,16 +37,13 @@ git技术B --- --- +======= +>>>>>>> parent of 5db074b (feat:README.md) --- ``` git_6 ``` -``` -git_7 -``` ---- - --- -- Gitee From c3c0d2b3b7e0bc694d323f637f54bde9ff0bbffd Mon Sep 17 00:00:00 2001 From: "jintao.wang" <15236286736@163.com> Date: Fri, 6 Sep 2024 09:47:00 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index efde82a..90b0264 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,6 @@ brew install sdl2{,_image,_mixer,_ttf,_gfx} pkg-config --- -<<<<<<< HEAD ``` git技术 ``` @@ -37,8 +36,6 @@ git技术B --- --- -======= ->>>>>>> parent of 5db074b (feat:README.md) --- ``` git_6 -- Gitee From d4bced1299a3d1a8797470a12ec60bed61b77b13 Mon Sep 17 00:00:00 2001 From: "jintao.wang" <15236286736@163.com> Date: Fri, 6 Sep 2024 09:48:46 +0800 Subject: [PATCH 12/12] =?UTF-8?q?feat:git=20revert=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/a.txt b/a.txt index 7171531..853db53 100644 --- a/a.txt +++ b/a.txt @@ -3,4 +3,9 @@ git测试 git revert学习 +git revert回滚 + + + + -- Gitee