- clone your own project to your workspace 克隆一个仓库
- e.g.:
http://xxxx/xxxxxx/xxxxxx.git
- GUI Tool:sourcetree GUI工具
- e.g.:
- add upstream for rebase
git remote add upstream http://xxxx/xxxxxx/xxxx.git 创建一个本地仓库
- change to your local master branch
git checkout master 移动到·master上面去
- checkout a new branch for dev :
git checkout -b f/spike 创建一个本地
的分支,用于开发。 - finish your development on the new spike branch
- commit your branch
- checkout your branch for push
git checkout master 移动到·master上面去
git checkout -b f/release 在
创建一个本地
的分支,用于上传。
- merge dev branch to release branch
git merge --squash f/spike 开发的代码merge到用于上传的分支上面。
- push your branch
- append
Closes #123
to commit-message 写注释 git push f/release push到远端仓库。
- append
- add a merge request
- append
# xxx
to title field
- append
WorkFlow for Rebase/Update your master
git checkout master 移动到·master上面去
git fetch upstream 从远端仓库把更新的文件拿下来
git rebase upstream/master 把更新的文件rebase到本地仓库里面。
git push origin