lzwaizl / lzwaizl.github.io Goto Github PK

# fork 开发仓库 (eg: [email protected]:user/xxoo.git)
git clone [email protected]:user/xxoo.git                 ## 克隆 fork 的仓库
git remote add xxoo [email protected]:tinfinite/xxoo.git  ## 添加开发仓库的源 (可使用git remote -v 查看)
git fetch xxoo                                         ## 获取远程开发仓库的分支和提交
git checkout -b develop xxoo/develop                   ## 拉取远程开发仓库源的 develop 分支
git push -u origin develop                             ## 推送到远程

git checkout -b some-feature develop                   ## 创建feature分支
# coding
git add .
git commit -m "feature description"
git push -u origin some-feature                        ## 推送到远程

git checkout develop                                   ## 切回 develop 分支
git pull xxoo develop                                 ## 将开发仓库 develop 分支合并到本地 develop 分支
git merge some-feature                                 ## 将本地 feature 分支合并到本地 develop 分支
git push origin develop                                ## 推送到远程
git push origin --delete some-feature                  ## 删除远程 feature 分支
git fetch -p                                           ## 删除不存在对应远程分支的本地分支（删除本地 feature 分支）

git pull origin develop
git checkout -b release-x.y.z develop                  ##  clean up the release, test everything, update the documentation, and do any other kind of preparation for the upcoming release

git checkout master
git merge release-x.y.z
git push

git checkout develop
git merge release-x.y.z
git push

git branch -d release-x.y.z
git tag -a x.y.z -m "some desc" master
git push --tags

# writing bug in issues
git checkout -b issue-#001 master
# Fix the bug
git checkout master
git merge issue-#001
git push

git checkout develop
git merge issue-#001
git push
git branch -d issue-#001