Git 分支 主干

~/Desktop/work/movies/movie(apps) $ git status  //先查看是否有需要提交的东西
# On branch apps
nothing to commit (working directory clean)
~/Desktop/work/movies/movie(apps) $ git checkout master //切换到主干
Switched to branch 'master'
~/Desktop/work/movies/movie(master) $ git status  //查看主干是否有需要提交的东西
# On branch master
nothing to commit (working directory clean)
~/Desktop/work/movies/movie(master) $ git pull  //再次确认是否需要更新代码查看主干是否有需要提交的东西
Already up-to-date.

~/Desktop/work/movies/movie(master) $ git checkout apps //切换到分支

Switched to branch 'apps'

~/Desktop/work/movies/movie(apps) $ git rebase master//拷贝主干最新内容
Current branch apps is up to date.
~/Desktop/work/movies/movie(apps) $ git checkout master //切换到主干
Switched to branch 'master'

~/Desktop/work/movies/movie(master) $ git merge apps //合并分支
Updating e6ba441..9bc179d
Fast-forward
 .../Classes/UI/Film/FilmListController.m           |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
~/Desktop/work/movies/movie(master) $ git branch
  apps
* master
~/Desktop/work/movies/movie(master) $ git apps
git: 'apps' is not a git command. See 'git --help'.

Did you mean this?
apply
~/Desktop/work/movies/movie(master) $ git checkout apps
Switched to branch 'apps'
~/Desktop/work/movies/movie(apps) $

 

 

原文来自:  http://blog.csdn.net/hufengvip/article/details/7179067