創建分支
git branch dev
創建+切換分支
git branch -b dev
##查看遠程分支
加上-a參數可以查看遠程分支,遠程分支會用紅色表示出來(如果你開了顏色支持的話):
$ git branch -a
master
remote
tungway
v1.52
* zrong
remotes/origin/master
remotes/origin/tungway
remotes/origin/v1.52
remotes/origin/zrong
查看本地分支
$ git branch
* dev
master
切換分支
$ git checkout -b dev origin/dev
Branch dev set up to track remote branch dev from origin.
Switched to a new branch 'dev'
刪除遠程分支和tag
在Git v1.7.0 之後,可以使用這種語法刪除遠程分支:
$ git push origin --delete <branchName>
刪除tag這麼用:
git push origin --delete tag <tagname>
否則,可以使用這種語法,推送一個空分支到遠程分支,其實就相當於刪除遠程分支:
git push origin :<branchName>
這是刪除tag的方法,推送一個空tag到遠程tag:
git tag -d <tagname>
git push origin :refs/tags/<tagname>
兩種語法作用完全相同
刪除不存在對應遠程分支的本地分支##
假設這樣一種情況:
我創建了本地分支b1並pull到遠程分支 origin/b1;
其他人在本地使用fetch或pull創建了本地的b1分支;
我刪除了 origin/b1 遠程分支;
其他人再次執行fetch或者pull並不會刪除這個他們本地的 b1 分支,運行 git branch -a 也不能看出這個branch被刪除了,如何處理?
使用下面的代碼查看b1的狀態:
$ git remote show origin
* remote origin
Fetch URL: [email protected]:xxx/xxx.git
Push URL: [email protected]:xxx/xxx.git
HEAD branch: master
Remote branches:
master tracked
refs/remotes/origin/b1 stale (use 'git remote prune' to remove)
Local branch configured for 'git pull':
master merges with remote master
Local ref configured for 'git push':
master pushes to master (up to date)
這時候能夠看到b1是stale的,使用 git remote prune origin 可以將其從本地版本庫中去除。
更簡單的方法是使用這個命令,它在fetch之後刪除掉沒有與遠程分支對應的本地分支:
$ git branch -av
* devel 752bb84 Merge pull request #158 from Gwill/devel
master 53b27b8 Merge pull request #138 from tdlrobin/master
zrong 2ae98d8 modify CCFileUtils, export getFileData
remotes/origin/HEAD -> origin/master
remotes/origin/add_build_script d4a8c4f Merge branch 'master' into add_build_script
remotes/origin/devel 752bb84 Merge pull request #158 from Gwill/devel
remotes/origin/devel_qt51 62208f1 update .gitignore
remotes/origin/master 53b27b8 Merge pull request #138 from tdlrobin/master
remotes/origin/zrong 2ae98d8 modify CCFileUtils, export getFileData
刪除遠程分支:
$ git push --delete origin devel
To [email protected]:zrong/quick-cocos2d-x.git
- [deleted] devel
重命名本地分支:
git branch -m devel develop
推送本地分支:
$ git push origin develop
Counting objects: 92, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (48/48), done.
Writing objects: 100% (58/58), 1.38 MiB, done.
Total 58 (delta 34), reused 12 (delta 5)
To [email protected]:zrong/quick-cocos2d-x.git
* [new branch] develop -> develop
把本地tag推送到遠程
git push --tags
獲取遠程tag
git fetch origin tag <tagname>
更新遠程分支列表
git remote update origin --prune
更新遠程分支到本地
git merge origin tag<tagname>
回退到某某版本
git reset --hard HEAD^
解決遠程分支代碼到本地有衝突
git stash
git fetch -p
git merge origin tag
git stash pop(然後手動解決保留哪份代碼)