Git 操作

一、分支

1、查看远程的分支

命令：git branch

事例

yuancandeMacBook-Pro-2:NJZ_Tourist yuancan$ git branch
* master
  v1.3.0

 

命令：git branch -a

事例

yuancandeMacBook-Pro-2:NJZ_Tourist yuancan$ git branch -a
* master
  v1.3.0
  v1.3.1
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
  remotes/origin/v1.3.0
  remotes/origin/v1.3.1
  remotes/origin/v2.0.0

 2、切换分支

命令：git checkout 分支名称

事例

yuancandeMacBook-Pro-2:NJZ_Tourist yuancan$ git checkout v1.3.0
Switched to branch 'v1.3.0'

3、合并分支

第一步：切换到主分支
yuancandeMacBook-Pro-2:NJZ_Tourist yuancan$ git checkout master
Switched to branch 'master'

第二步：在主分支上合并分支

yuancandeMacBook-Pro-2:NJZ_Tourist yuancan$ git merge v1.3.0
Updating cfbdc69..9a80336

 

4、新建分支

命令：git branch 分支名称

事例

1、在本地新建一个分支

    git branch v1.3.1

2、将本地分支推送到远程服务器

    git push origin v1.3.1