常用操作
dev分支测试ok后合并到master分支
1
2
3
4
5git checkout dev
git pull
git checkout master
git merge dev
git push -u origin mastermaster分支更新后dev1分支同步master分支
1
2
3
4
5git checkout master
git pull
git checkout dev
git merge master
git push -u origin dev从dev分支创建release分支，例如要发布2.0版本
1
2
3
4git checkout -b release-2.0 develop
// change something to commit
git commit -a -m "Bumped version number to 2.0"
git pushrelease分支合并到master分支同上1
删除本地release分支
1
2git branch -d release-2.0
git push删除远程release分支
1
git push origin --delete release-2.0
bug分支，master分支上或其他某分支发现bug，则从当前分支上分出来一个branch
1
2
3
4
5
6
7
8
9
10
11git checkout -b ISSUE-110 master
// change something
git commit -a -m "Bumped version number to 2.0.1"
//fix bug
git commit -m "Fixed ISSUE-110 problem"
git checkout master
git merge --no-ff ISSUE-110
git tag -a 2.0.1
git checkout develop
git merge --no-ff ISSUE-110
git branch -d ISSUE-110查看分支关系 git log –graph –decorate –oneline –simplify-by-decoration –all
退出git log方法 英文字母Q