Git 工作流

frank-lam · Nov 17, 2018 · 5834492 · 5834492
1 parent 1c889e7
commit 5834492
Show file tree

Hide file tree

Showing 63 changed files with 932 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -221,9 +221,9 @@
 
   基本概念，常见命令，速查表
 
-- [GitFlow](notes/GitFLow.md)
+- [Git 工作流](notes/Git工作流.md)
 
-  Git 工作流概念
+  Git 工作流简介，集中式工作流，功能分支工作流， GitFlow 工作流，Forking 工作流，Pull Requests
 
 - [正则表达式](notes/EfficiencyTools/正则表达式.md)
 

diff --git a/notes/Git.md b/notes/Git.md
@@ -289,7 +289,7 @@ $ git remote set-url origin https://xxx.git
 
 # 三、Git 常用场景
 
-## 1. 删除本地文件后，想从远程仓库中重新Pull最新版文件
+## 1. 删除本地文件后，想从远程仓库中重新 Pull 最新版文件
 
 Git提示：up-to-date，但未得到删除的文件
 

diff --git a/notes/GitFlow.md b/notes/GitFlow.md
diff --git a/notes/Git工作流.md b/notes/Git工作流.md
diff --git a/notes/assets/example-6.png b/notes/assets/example-6.png
diff --git a/notes/assets/git-workflow-feature-branch-1-1542442210570.png b/notes/assets/git-workflow-feature-branch-1-1542442210570.png
diff --git a/notes/assets/git-workflow-feature-branch-1.png b/notes/assets/git-workflow-feature-branch-1.png
diff --git a/notes/assets/git-workflow-feature-branch-2.png b/notes/assets/git-workflow-feature-branch-2.png
diff --git a/notes/assets/git-workflow-feature-branch-3.png b/notes/assets/git-workflow-feature-branch-3.png
diff --git a/notes/assets/git-workflow-feature-branch-4.png b/notes/assets/git-workflow-feature-branch-4.png
diff --git a/notes/assets/git-workflow-feature-branch-5.png b/notes/assets/git-workflow-feature-branch-5.png
diff --git a/notes/assets/git-workflow-feature-branch-6.png b/notes/assets/git-workflow-feature-branch-6.png
diff --git a/notes/assets/git-workflow-feature-branch-7.png b/notes/assets/git-workflow-feature-branch-7.png
diff --git a/notes/assets/git-workflow-forking.png b/notes/assets/git-workflow-forking.png
diff --git a/notes/assets/git-workflow-gitflow-enduserbug.png b/notes/assets/git-workflow-gitflow-enduserbug.png
diff --git a/notes/assets/git-workflow-release-cycle-1historical.png b/notes/assets/git-workflow-release-cycle-1historical.png
diff --git a/notes/assets/git-workflow-release-cycle-2feature.png b/notes/assets/git-workflow-release-cycle-2feature.png
diff --git a/notes/assets/git-workflow-release-cycle-3release.png b/notes/assets/git-workflow-release-cycle-3release.png
diff --git a/notes/assets/git-workflow-release-cycle-4maintenance.png b/notes/assets/git-workflow-release-cycle-4maintenance.png
diff --git a/notes/assets/git-workflow-release-cycle-5createdev.png b/notes/assets/git-workflow-release-cycle-5createdev.png
diff --git a/notes/assets/git-workflow-release-cycle-6maryjohnbeginnew.png b/notes/assets/git-workflow-release-cycle-6maryjohnbeginnew.png
diff --git a/notes/assets/git-workflow-release-cycle-7maryfinishes.png b/notes/assets/git-workflow-release-cycle-7maryfinishes.png
diff --git a/notes/assets/git-workflow-release-cycle-8maryprepsrelease.png b/notes/assets/git-workflow-release-cycle-8maryprepsrelease.png
diff --git a/notes/assets/git-workflow-release-cycle-9maryfinishes.png b/notes/assets/git-workflow-release-cycle-9maryfinishes.png
diff --git a/notes/assets/git-workflow-svn-1.png b/notes/assets/git-workflow-svn-1.png
diff --git a/notes/assets/git-workflow-svn-2.png b/notes/assets/git-workflow-svn-2.png
diff --git a/notes/assets/git-workflow-svn-3.png b/notes/assets/git-workflow-svn-3.png
diff --git a/notes/assets/git-workflow-svn-4.png b/notes/assets/git-workflow-svn-4.png
diff --git a/notes/assets/git-workflow-svn-5.png b/notes/assets/git-workflow-svn-5.png
diff --git a/notes/assets/git-workflow-svn-6.png b/notes/assets/git-workflow-svn-6.png
diff --git a/notes/assets/git-workflow-svn-7.png b/notes/assets/git-workflow-svn-7.png
diff --git a/notes/assets/git-workflow-svn-8.png b/notes/assets/git-workflow-svn-8.png
diff --git a/notes/assets/git-workflow-svn-9.png b/notes/assets/git-workflow-svn-9.png
diff --git a/notes/assets/git-workflow-svn-clone.png b/notes/assets/git-workflow-svn-clone.png
diff --git a/notes/assets/git-workflow-svn-initialize.png b/notes/assets/git-workflow-svn-initialize.png
diff --git a/notes/assets/git-workflow-svn-managingconflicts.png b/notes/assets/git-workflow-svn-managingconflicts.png
diff --git a/notes/assets/git-workflow-svn-push-local.png b/notes/assets/git-workflow-svn-push-local.png
diff --git a/notes/assets/git-workflow-svn.png b/notes/assets/git-workflow-svn.png
diff --git a/notes/assets/git-workflows-forking-1.png b/notes/assets/git-workflows-forking-1.png
diff --git a/notes/assets/git-workflows-forking-2.png b/notes/assets/git-workflows-forking-2.png
diff --git a/notes/assets/git-workflows-forking-3.png b/notes/assets/git-workflows-forking-3.png
diff --git a/notes/assets/git-workflows-forking-4.png b/notes/assets/git-workflows-forking-4.png
diff --git a/notes/assets/git-workflows-forking-5.png b/notes/assets/git-workflows-forking-5.png
diff --git a/notes/assets/git-workflows-forking-6.png b/notes/assets/git-workflows-forking-6.png
diff --git a/notes/assets/git-workflows-forking-7.png b/notes/assets/git-workflows-forking-7.png
diff --git a/notes/assets/git-workflows-forking.png b/notes/assets/git-workflows-forking.png
diff --git a/notes/assets/git-workflows-gitflow-1542442241823.png b/notes/assets/git-workflows-gitflow-1542442241823.png
diff --git a/notes/assets/git-workflows-gitflow.png b/notes/assets/git-workflows-gitflow.png
diff --git a/notes/assets/gitflow-workflow-pull-request.png b/notes/assets/gitflow-workflow-pull-request.png
diff --git a/notes/assets/pull-request-1.png b/notes/assets/pull-request-1.png
diff --git a/notes/assets/pull-request-2.png b/notes/assets/pull-request-2.png
diff --git a/notes/assets/pull-request-3.png b/notes/assets/pull-request-3.png
diff --git a/notes/assets/pull-request-5.png b/notes/assets/pull-request-5.png
diff --git a/notes/assets/pull-request-7.png b/notes/assets/pull-request-7.png
diff --git a/notes/assets/pull-request-8.png b/notes/assets/pull-request-8.png
diff --git a/notes/assets/pull-request-9.png b/notes/assets/pull-request-9.png
diff --git a/notes/assets/pull-request-anatomy.png b/notes/assets/pull-request-anatomy.png
diff --git a/notes/assets/pull-request-bitbucket.png b/notes/assets/pull-request-bitbucket.png
diff --git a/notes/assets/pull-request-feature-branch.png b/notes/assets/pull-request-feature-branch.png
diff --git a/notes/assets/pull-request-forking-workflow-1.png b/notes/assets/pull-request-forking-workflow-1.png
diff --git a/notes/assets/pull-request-forking-workflow-2.png b/notes/assets/pull-request-forking-workflow-2.png
diff --git a/notes/assets/pull-request-overview.png b/notes/assets/pull-request-overview.png
diff --git a/notes/assets/pull-request.png b/notes/assets/pull-request.png