Skip to content

captain-tony/faster-git

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

49 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

faster-git

课程内容:

  1. 第一章 Git是什么
  2. 第二章 Git基础命令
  3. 第三章 Git分支管理
  4. 第四章 Git工具
  5. 第五章 Git内部原理
  6. 第六章 GitFlow工作流实战
  7. 第七章 Git提交规范
  8. 第八章 Github/Gitee使用说明
  9. 第九章 Git可视化工具下载
  10. 第十章 Git团队协作以及合并时的diff工具

Contributing

主分支为main

Workflow

本项目使用Forking工作流,具体参考atlassian文档

大致步骤如下:

  1. 在GitHub上Fork本仓库
  2. Clone Fork后的个人仓库
  3. 设置upstream仓库地址,并禁用push
  4. 使用分支开发,课程分支名为lecture{#NO}#NO保持两位,如lecture07,对应课程目录
  5. PR之前保持与原始仓库的同步,之后发起PR请求

命令示例:

# fork
# clone
git clone [email protected]:USERNAME/faster-git.git

# set upstream
git remote add upstream [email protected]:datawhalechina/faster-git.git
# disable upstream push
git remote set-url --push upstream DISABLE
# verify
git remote -v
# some sample output:
# origin	[email protected]:tomowang/faster-git.git (fetch)
# origin	[email protected]:tomowang/faster-git.git (push)
# upstream	[email protected]:datawhalechina/faster-git.git (fetch)
# upstream	DISABLE (push)

# do your work
git checkout -b lecture07
# edit and commit and push your changes
git push -u origin lecture07

# keep your fork up to date
## fetch upstream main and merge with forked main branch
git fetch upstream
git checkout main
git merge upstream/main
## rebase brach and force push
git checkout lecture07
git rebase main
git push -f

Commit Message

提交信息使用如下格式:<type>: <short summary>

<type>: <short summary>
  │            │
  │            └─⫸ Summary in present tense. Not capitalized. No period at the end.
  │
  └─⫸ Commit Type: lecture{#NO}|others

others包括非课程相关的改动,如本README.md中的变动,.gitignore的调整等。

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published