git 分支

创建本地分支并跟踪到远程分支

git checkout -b

切换本地分支

git checkout

查看全部分支

git branch -a

查看本地分支状态

git branch -vvv

合并（把指定分支的内容合并到当前分支）

git merge

提交

Git add 这个命令是将工作区内容提交到暂存区
Git commit 这个命令是将暂存区内容提交到本地分支
Git push 是将本地分支内容提交到对应的远程分支

开发模式1

一个主分支 一个开发分支

一个主分支 多个开发分支 多个热更新分支

git pull
From https://code.aliyun.com/otouzi/otouzi-ios

• [new branch] develop -> origin/develop
  Already up to date.
  bogon:otouzi-ios mark$ git branch -a
• master
  remotes/origin/HEAD -> origin/master
  remotes/origin/develop
  remotes/origin/master
  bogon:otouzi-ios mark git branch -a
• develop
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/develop
  remotes/origin/master
  bogon:otouzi-ios mark$ git branch -vvv
• develop a3a7c29 [origin/develop] updated20
  master a3a7c29 [origin/master] updated20
  bogon:otouzi-ios mark$ git status
  On branch develop
  Your branch is up to date with 'origin/develop'.

nothing to commit, working tree clean
bogon:otouzi-ios mark$ git branch

• develop
  master
  bogon:otouzi-ios mark git -h
  unknown option: -h
  usage: git [--version] [--help] [-C ] [-c =]
  [--exec-path[=]] [--html-path] [--man-path] [--info-path]
  [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
  [--git-dir=] [--work-tree=] [--namespace=]
  []
  bogon:otouzi-ios mark$ git --help
  usage: git [--version] [--help] [-C ] [-c =]
  [--exec-path[=]] [--html-path] [--man-path] [--info-path]
  [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
  [--git-dir=] [--work-tree=] [--namespace=]
  []

These are common Git commands used in various situations:

start a working area (see also: git help tutorial)
clone Clone a repository into a new directory
init Create an empty Git repository or reinitialize an existing one

work on the current change (see also: git help everyday)
add Add file contents to the index
mv Move or rename a file, a directory, or a symlink
reset Reset current HEAD to the specified state
rm Remove files from the working tree and from the index

examine the history and state (see also: git help revisions)
bisect Use binary search to find the commit that introduced a bug
grep Print lines matching a pattern
log Show commit logs
show Show various types of objects
status Show the working tree status

grow, mark and tweak your common history
branch List, create, or delete branches
checkout Switch branches or restore working tree files
commit Record changes to the repository
diff Show changes between commits, commit and working tree, etc
merge Join two or more development histories together
rebase Reapply commits on top of another base tip
tag Create, list, delete or verify a tag object signed with GPG

collaborate (see also: git help workflows)
fetch Download objects and refs from another repository
pull Fetch from and integrate with another repository or a local branch
push Update remote refs along with associated objects

'git help -a' and 'git help -g' list available subcommands and some
concept guides. See 'git help ' or 'git help '
to read about a specific subcommand or concept.
bogon:otouzi-ios mark$ git add