From 381c2fb1ac3d7688e5dea63cb27467f5f7e95613 Mon Sep 17 00:00:00 2001 From: yangyz01 Date: Wed, 1 Apr 2020 22:57:05 +0800 Subject: [PATCH 1/7] =?UTF-8?q?git=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Test.txt diff --git a/Test.txt b/Test.txt new file mode 100644 index 0000000..dab518f --- /dev/null +++ b/Test.txt @@ -0,0 +1 @@ +测试版本1 \ No newline at end of file -- Gitee From b68d113a4b666bbabc76577dd39d1ae4fbdb9754 Mon Sep 17 00:00:00 2001 From: yangyz01 Date: Wed, 1 Apr 2020 23:01:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6d06388..9f61818 100644 --- a/README.md +++ b/README.md @@ -9,15 +9,75 @@ Spring 入门课程代码 #### 安装教程 -1. xxxx -2. xxxx -3. xxxx +1. 下载git +2. 安装git + #### 使用说明 -1. xxxx -2. xxxx -3. xxxx +根据https://www.runoob.com/manual/git-guide/ 这个，使用命令行，做如下操作： + +1. 打开git命令行，下载一下https://gitee.com/SpringLearning/SpringBasic 这个项目到本地 + +```bash +$ git clone https://gitee.com/SpringLearning/SpringBasic.git + +Cloning into 'SpringBasic'... +libpng warning: iCCP: cHRM chunk does not match sRGB +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (5/5), done. +remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (5/5), done. + +$ git status +On branch master +Your branch is up to date with 'origin/master'. + +``` + +2. 进入SpringBasic目录，然后切换到develop分支 + +```bash +$ cd SprintBasic +$ git checkout -b develop + +Switched to a new branch 'develop' + +$ git status +On branch develop +nothing to commit, working tree clean +``` +3. 新建一个文件test.txt，输入一些内容，然后使用git管理 +```bash +$ git add * + +``` +4. 将文件提交到暂存区 +```bash +$ git commit -m "Git测试" + +[develop 381c2fb] git 测试 + 1 file changed, 1 insertion(+) + create mode 100644 Test.txt +``` + +5. 将文件推送到远程的develop分支（） + +```bash +$ git push origin develop +Enumerating objects: 4, done. +Counting objects: 100% (4/4), done. +Delta compression using up to 4 threads +Compressing objects: 100% (2/2), done. +Writing objects: 100% (3/3), 286 bytes | 95.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-3.8] +To https://gitee.com/SpringLearning/SpringBasic.git + 4fc530c..381c2fb develop -> develop +``` + + #### 参与贡献 -- Gitee From 04ca19ad03bdb0ae5a4b5044c06ee676cd979df9 Mon Sep 17 00:00:00 2001 From: yangyz01 Date: Wed, 1 Apr 2020 23:08:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f61818..2b468ac 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Spring 入门课程代码 2. 安装git -#### 使用说明 +#### 添加一个文件并提交到Gitee 根据https://www.runoob.com/manual/git-guide/ 这个，使用命令行，做如下操作： @@ -62,7 +62,7 @@ $ git commit -m "Git测试" create mode 100644 Test.txt ``` -5. 将文件推送到远程的develop分支（） +5. 将文件推送到远程的develop分支 ```bash $ git push origin develop @@ -78,6 +78,47 @@ To https://gitee.com/SpringLearning/SpringBasic.git ``` +#### 修改文件并提交到Gitee + +1. 修改README.md，然后使用git管理 +```bash +$ git add README.md + +``` +2. 将文件提交到暂存区 +```bash +$ git commit -m "修改readme" + +[develop b68d113] 修改readme + 1 file changed, 66 insertions(+), 6 deletions(-) +``` + +3. 将文件推送到远程的develop分支 + +```bash +$ git push origin develop +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 1.63 KiB | 833.00 KiB/s, done. +Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 +remote: Powered by GITEE.COM [GNK-3.8] +To https://gitee.com/SpringLearning/SpringBasic.git + 381c2fb..b68d113 develop -> develop +``` + + +#### 将develop分支代码合并到master分支 + +1. 直接将本地代码提交到master分支（不建议） +```bash +$ git push origin master + +``` +2. 通过网页端，提交merge request + + #### 参与贡献 -- Gitee From a4c0e63d276553f13b90a4c50955578ba098bf9b Mon Sep 17 00:00:00 2001 From: adairs Date: Thu, 2 Apr 2020 11:36:57 +0800 Subject: [PATCH 4/7] add LICENSE. --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..29f81d8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- Gitee From 610b029e9ef1f6abf96669382ff5e018a3b2f2b5 Mon Sep 17 00:00:00 2001 From: chen Date: Sat, 4 Apr 2020 00:57:11 +0800 Subject: [PATCH 5/7] one --- one.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 one.txt diff --git a/one.txt b/one.txt new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/one.txt @@ -0,0 +1 @@ +test \ No newline at end of file -- Gitee From dc9da7c9b60c0fdb8c18d8044a999473a0d644cc Mon Sep 17 00:00:00 2001 From: chen Date: Sat, 4 Apr 2020 01:02:27 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- one.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/one.txt b/one.txt index 30d74d2..39bd688 100644 --- a/one.txt +++ b/one.txt @@ -1 +1,2 @@ -test \ No newline at end of file +test +test2 \ No newline at end of file -- Gitee From 9c5131ee8b0563eced42a108297fcb91f343888e Mon Sep 17 00:00:00 2001 From: yangyz01 Date: Sat, 4 Apr 2020 01:18:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2b468ac..f2130c2 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,16 @@ Spring 入门课程代码 1. 下载git 2. 安装git +#### 配置git的用户名和邮箱 +1. 打开git命令行，配置用户名和邮箱 -#### 添加一个文件并提交到Gitee +```bash +git config --global user.name "adairs" +git config --global user.email "adairs@yeah.com" + +``` + +#### 下载项目的Git代码 根据https://www.runoob.com/manual/git-guide/ 这个，使用命令行，做如下操作： @@ -30,17 +38,13 @@ remote: Compressing objects: 100% (5/5), done. remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (5/5), done. -$ git status -On branch master -Your branch is up to date with 'origin/master'. - ``` 2. 进入SpringBasic目录，然后切换到develop分支 ```bash $ cd SprintBasic -$ git checkout -b develop +$ git checkout -b develop origin/develop Switched to a new branch 'develop' @@ -48,12 +52,15 @@ $ git status On branch develop nothing to commit, working tree clean ``` -3. 新建一个文件test.txt，输入一些内容，然后使用git管理 + + +#### 添加一个文件并提交到Gitee +1. 新建一个文件test.txt，输入一些内容，然后使用git管理 ```bash $ git add * ``` -4. 将文件提交到暂存区 +2. 将文件提交到暂存区 ```bash $ git commit -m "Git测试" @@ -62,7 +69,7 @@ $ git commit -m "Git测试" create mode 100644 Test.txt ``` -5. 将文件推送到远程的develop分支 +3. 将文件推送到远程的develop分支 ```bash $ git push origin develop -- Gitee