From 3f4bff2f665212faf2615c54b6b61210e51ac199 Mon Sep 17 00:00:00 2001 From: govolokatliai Date: Mon, 14 Oct 2024 21:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=96=87=E7=AB=A0=E9=9B=86-g?= =?UTF-8?q?it=E5=9F=B9=E8=AE=AD=EF=BC=8C=E8=A7=84=E5=88=92=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=BB=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/devdocs/09-培训/01-git/01-概览.md | 44 ++++++++++++++++++ .../02-介绍-做为版本控制系统的git/01-vcs.md | 1 + .../02-gitintroduction.md | 1 + .../03-git的基础概念/01-新建一个git仓库.md | 1 + .../03-git的基础概念/02-跟踪文件,暂存文件.md | 1 + .../01-git/03-git的基础概念/03-提交commit.md | 1 + .../01-git/03-git的基础概念/04-branch.md | 1 + .../03-git的基础概念/05-HEADandRefrences.md | 1 + .../01-git/03-git的基础概念/05-MergeAndMore.md | 1 + .../01-git/04-远程仓库/01-CloneOrigin.md | 1 + .../01-git/04-远程仓库/02-remotebranch.md | 1 + .../01-git/04-远程仓库/03-fetchpullpush.md | 1 + .../09-培训/01-git/05-托管平台/01-github.md | 1 + .../09-培训/01-git/05-托管平台/02-gitlab.md | 1 + .../09-培训/01-git/05-托管平台/03-gitea.md | 1 + docs/devdocs/09-培训/01-git/06-高级/01-gui.md | 1 + .../09-培训/01-git/06-高级/02-selfhosted.md | 1 + .../09-培训/01-git/06-高级/03-references.md | 1 + docs/wiki/.10-资源.md.kate-swp | Bin 0 -> 100 bytes docs/wiki/01-首页.md | 1 + todolists.md | 8 ++++ 21 files changed, 70 insertions(+) create mode 100644 docs/devdocs/09-培训/01-git/01-概览.md create mode 100644 docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/01-vcs.md create mode 100644 docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/02-gitintroduction.md create mode 100644 docs/devdocs/09-培训/01-git/03-git的基础概念/01-新建一个git仓库.md create mode 100644 docs/devdocs/09-培训/01-git/03-git的基础概念/02-跟踪文件,暂存文件.md create mode 100644 docs/devdocs/09-培训/01-git/03-git的基础概念/03-提交commit.md create mode 100644 docs/devdocs/09-培训/01-git/03-git的基础概念/04-branch.md create mode 100644 docs/devdocs/09-培训/01-git/03-git的基础概念/05-HEADandRefrences.md create mode 100644 docs/devdocs/09-培训/01-git/03-git的基础概念/05-MergeAndMore.md create mode 100644 docs/devdocs/09-培训/01-git/04-远程仓库/01-CloneOrigin.md create mode 100644 docs/devdocs/09-培训/01-git/04-远程仓库/02-remotebranch.md create mode 100644 docs/devdocs/09-培训/01-git/04-远程仓库/03-fetchpullpush.md create mode 100644 docs/devdocs/09-培训/01-git/05-托管平台/01-github.md create mode 100644 docs/devdocs/09-培训/01-git/05-托管平台/02-gitlab.md create mode 100644 docs/devdocs/09-培训/01-git/05-托管平台/03-gitea.md create mode 100644 docs/devdocs/09-培训/01-git/06-高级/01-gui.md create mode 100644 docs/devdocs/09-培训/01-git/06-高级/02-selfhosted.md create mode 100644 docs/devdocs/09-培训/01-git/06-高级/03-references.md create mode 100644 docs/wiki/.10-资源.md.kate-swp diff --git a/docs/devdocs/09-培训/01-git/01-概览.md b/docs/devdocs/09-培训/01-git/01-概览.md new file mode 100644 index 0000000..64ca7df --- /dev/null +++ b/docs/devdocs/09-培训/01-git/01-概览.md @@ -0,0 +1,44 @@ +# 概览Git +这里是git的一个简短教程 +## 目录 +本教程的目录。。。 + +1. 介绍-做为版本控制系统的git + + - 什么是版本控制系统(VCS)? + - git是如何进行版本控制的? + +2. git的基础概念 + + - 新建一个git仓库 + - 跟踪文件,暂存文件 + - 提交commit + - 分支(branch)介绍 + - 合并-merge与rebase + - cherry-pick + - HEAD和相对引用 + +3. 远程仓库 + + - clone和origin + - 远程分支是什么 + - fetch , pull & push ! + +4. 托管平台 + + - github + - gitlab + - gitea + +5. 高级 + + - GUI + - git-gui + - vscode上的一些扩展 + - lazygit + - 自建git服务 + - gitea + - 参考 + - pro git + - learngitbranching.js.org + diff --git a/docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/01-vcs.md b/docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/01-vcs.md new file mode 100644 index 0000000..4a06e4b --- /dev/null +++ b/docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/01-vcs.md @@ -0,0 +1 @@ +# 什么是版本控制系统(VCS)? diff --git a/docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/02-gitintroduction.md b/docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/02-gitintroduction.md new file mode 100644 index 0000000..ce4b142 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/02-介绍-做为版本控制系统的git/02-gitintroduction.md @@ -0,0 +1 @@ +# git是如何进行版本控制的? diff --git a/docs/devdocs/09-培训/01-git/03-git的基础概念/01-新建一个git仓库.md b/docs/devdocs/09-培训/01-git/03-git的基础概念/01-新建一个git仓库.md new file mode 100644 index 0000000..51a8864 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/03-git的基础概念/01-新建一个git仓库.md @@ -0,0 +1 @@ +# 新建一个git仓库 diff --git a/docs/devdocs/09-培训/01-git/03-git的基础概念/02-跟踪文件,暂存文件.md b/docs/devdocs/09-培训/01-git/03-git的基础概念/02-跟踪文件,暂存文件.md new file mode 100644 index 0000000..fa47868 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/03-git的基础概念/02-跟踪文件,暂存文件.md @@ -0,0 +1 @@ +# 跟踪文件,暂存文件 diff --git a/docs/devdocs/09-培训/01-git/03-git的基础概念/03-提交commit.md b/docs/devdocs/09-培训/01-git/03-git的基础概念/03-提交commit.md new file mode 100644 index 0000000..d9c0abc --- /dev/null +++ b/docs/devdocs/09-培训/01-git/03-git的基础概念/03-提交commit.md @@ -0,0 +1 @@ +# 提交commit diff --git a/docs/devdocs/09-培训/01-git/03-git的基础概念/04-branch.md b/docs/devdocs/09-培训/01-git/03-git的基础概念/04-branch.md new file mode 100644 index 0000000..818d78c --- /dev/null +++ b/docs/devdocs/09-培训/01-git/03-git的基础概念/04-branch.md @@ -0,0 +1 @@ +# 分支(branch)介绍 diff --git a/docs/devdocs/09-培训/01-git/03-git的基础概念/05-HEADandRefrences.md b/docs/devdocs/09-培训/01-git/03-git的基础概念/05-HEADandRefrences.md new file mode 100644 index 0000000..4f2e0c9 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/03-git的基础概念/05-HEADandRefrences.md @@ -0,0 +1 @@ +# HEAD和相对引用 diff --git a/docs/devdocs/09-培训/01-git/03-git的基础概念/05-MergeAndMore.md b/docs/devdocs/09-培训/01-git/03-git的基础概念/05-MergeAndMore.md new file mode 100644 index 0000000..dcf97e0 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/03-git的基础概念/05-MergeAndMore.md @@ -0,0 +1 @@ +# 合并-merge与rebase diff --git a/docs/devdocs/09-培训/01-git/04-远程仓库/01-CloneOrigin.md b/docs/devdocs/09-培训/01-git/04-远程仓库/01-CloneOrigin.md new file mode 100644 index 0000000..4a615ee --- /dev/null +++ b/docs/devdocs/09-培训/01-git/04-远程仓库/01-CloneOrigin.md @@ -0,0 +1 @@ +# clone和origin diff --git a/docs/devdocs/09-培训/01-git/04-远程仓库/02-remotebranch.md b/docs/devdocs/09-培训/01-git/04-远程仓库/02-remotebranch.md new file mode 100644 index 0000000..554335b --- /dev/null +++ b/docs/devdocs/09-培训/01-git/04-远程仓库/02-remotebranch.md @@ -0,0 +1 @@ +# 远程分支是什么 diff --git a/docs/devdocs/09-培训/01-git/04-远程仓库/03-fetchpullpush.md b/docs/devdocs/09-培训/01-git/04-远程仓库/03-fetchpullpush.md new file mode 100644 index 0000000..090cac8 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/04-远程仓库/03-fetchpullpush.md @@ -0,0 +1 @@ +# fetch , pull & push ! diff --git a/docs/devdocs/09-培训/01-git/05-托管平台/01-github.md b/docs/devdocs/09-培训/01-git/05-托管平台/01-github.md new file mode 100644 index 0000000..1a56017 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/05-托管平台/01-github.md @@ -0,0 +1 @@ +# github diff --git a/docs/devdocs/09-培训/01-git/05-托管平台/02-gitlab.md b/docs/devdocs/09-培训/01-git/05-托管平台/02-gitlab.md new file mode 100644 index 0000000..50c59aa --- /dev/null +++ b/docs/devdocs/09-培训/01-git/05-托管平台/02-gitlab.md @@ -0,0 +1 @@ +# gitlab diff --git a/docs/devdocs/09-培训/01-git/05-托管平台/03-gitea.md b/docs/devdocs/09-培训/01-git/05-托管平台/03-gitea.md new file mode 100644 index 0000000..46f0113 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/05-托管平台/03-gitea.md @@ -0,0 +1 @@ +# gitea diff --git a/docs/devdocs/09-培训/01-git/06-高级/01-gui.md b/docs/devdocs/09-培训/01-git/06-高级/01-gui.md new file mode 100644 index 0000000..94b9074 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/06-高级/01-gui.md @@ -0,0 +1 @@ +# GUI diff --git a/docs/devdocs/09-培训/01-git/06-高级/02-selfhosted.md b/docs/devdocs/09-培训/01-git/06-高级/02-selfhosted.md new file mode 100644 index 0000000..c5a41d8 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/06-高级/02-selfhosted.md @@ -0,0 +1 @@ +# 自建Git服务 diff --git a/docs/devdocs/09-培训/01-git/06-高级/03-references.md b/docs/devdocs/09-培训/01-git/06-高级/03-references.md new file mode 100644 index 0000000..2db65e5 --- /dev/null +++ b/docs/devdocs/09-培训/01-git/06-高级/03-references.md @@ -0,0 +1 @@ +# 参考 diff --git a/docs/wiki/.10-资源.md.kate-swp b/docs/wiki/.10-资源.md.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..26719753b9ab4709ad0780aea4de1850dbf5f4d3 GIT binary patch literal 100 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn`O;QmYrjmqd+zcR5ng|Dc1+!2s}md! glo14C23Igs2*L~nQo^pmAW8^A2}0xrfFhx;05i=NKmY&$ literal 0 HcmV?d00001 diff --git a/docs/wiki/01-首页.md b/docs/wiki/01-首页.md index 568e9fb..bcf4963 100644 --- a/docs/wiki/01-首页.md +++ b/docs/wiki/01-首页.md @@ -48,3 +48,4 @@ MacOS的修理事项 ::: + diff --git a/todolists.md b/todolists.md index 3cfff5d..bac2efc 100644 --- a/todolists.md +++ b/todolists.md @@ -1,3 +1,11 @@ # 备忘录 **这里是网站开发备忘录,有什么想法,事情,都可以记在这里,善用Markdown功能** - 在正式成员中招募一些人来持续维护wiki + +## 开发组业务 +报修系统 +招新系统 +网站 +开发组网站(wiki和文档) +服务器运维 +