git rebase 命令 常用_git的rebase等常用命令

>git checkout devTrunk

>git pull origin  devTrunk

>git checkout features/circle_share_poster

> git rebase devTrunk  (将当前分支的修改增加到devTrunk分支上，并生成新的版本, 理解成"重新设置基线”，为你的当前分支重新设置开始点)

... rebase有冲突时，修复冲突…

>git add .

>git rebase --continue

> git checkout devTrunk

> git merge features/circle_share_poster

--no-ff

>git push

>git checkout -b features/new_branch

>git push origin  features/new_branch

>git branch --set-upstream-to=origin/features/new_branch

features/new_branch

...git add  commit  arc

diff…

>git branch -D features/new_branch

>git push origin --delete

features/new_branch

创建tag：git tag -a tagName -m "my tag"

//用-a指定标签名，-m指定说明文字(例：git tag -a v7.48.0 -m "version 7.48.0

released" )

推送tag：git push origin tagName

／／所有commit合并为一条commit

>git checkout devTrunk

>git pull origin  devTrunk

>git merge --squash

features/circle_share_poster