From 4b1ed033d9824489863eba7d34a099c50baba6ec Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Tue, 21 Mar 2023 10:58:11 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95Git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 ++++++++ README.md | 6 ++++++ 2 files changed, 14 insertions(+) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/README.md b/README.md index d6414c0..5c1454a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ # phpstudy php学习 + + +测试一下git + + +当前分支被合并到其他分支后, 当前分支回滚, 在合并到其他分支, 其他分支是否产生变化. From 549adacfcb1813140c9c51de2ad931cc5c569005 Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Tue, 21 Mar 2023 10:59:34 +0800 Subject: [PATCH 2/6] add index.php --- README.md | 4 ++++ index.php | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 index.php diff --git a/README.md b/README.md index 5c1454a..14af547 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ php学习 当前分支被合并到其他分支后, 当前分支回滚, 在合并到其他分支, 其他分支是否产生变化. + + + +继续加一下东西 \ No newline at end of file diff --git a/index.php b/index.php new file mode 100644 index 0000000..7eb6c50 --- /dev/null +++ b/index.php @@ -0,0 +1,2 @@ + Date: Tue, 21 Mar 2023 11:06:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0git.ignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ git.ignore | 1 + index.php | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 git.ignore create mode 100644 index.php diff --git a/README.md b/README.md index 5c1454a..14af547 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ php学习 当前分支被合并到其他分支后, 当前分支回滚, 在合并到其他分支, 其他分支是否产生变化. + + + +继续加一下东西 \ No newline at end of file diff --git a/git.ignore b/git.ignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/git.ignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/index.php b/index.php new file mode 100644 index 0000000..7eb6c50 --- /dev/null +++ b/index.php @@ -0,0 +1,2 @@ + Date: Tue, 21 Mar 2023 11:08:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- git.ignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename git.ignore => .gitignore (100%) diff --git a/git.ignore b/.gitignore similarity index 100% rename from git.ignore rename to .gitignore From 92a9ad16cce2a3fa22d90877c877b3252fec5cee Mon Sep 17 00:00:00 2001 From: zhangxiang Date: Tue, 21 Mar 2023 11:12:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=99=E9=87=8C=E6=98=AF=E8=A6=81?= =?UTF-8?q?=E8=A2=AB=E5=9B=9E=E6=BB=9A=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- index.php | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 14af547..caedb31 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,7 @@ php学习 -继续加一下东西 \ No newline at end of file +继续加一下东西 + + +这里是要被回滚的 \ No newline at end of file diff --git a/index.php b/index.php index 7eb6c50..c0ef354 100644 --- a/index.php +++ b/index.php @@ -1,2 +1,4 @@ Date: Tue, 21 Mar 2023 11:16:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A6=BB=E8=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index c0ef354..f96f340 100644 --- a/index.php +++ b/index.php @@ -1,4 +1,7 @@