git 备忘

• 检出本地不存在的分支 ： git checkout -b new_branch origin/new_branch

• 出现 Your configuration specifies to merge with the ref 'refs/heads/test'from the remote, but no such ref was fetched. 这个问题
  解决方法：

  git pull (you'll see this "Your configuration specifies..")
  git branch --unset-upstream
  git push --set-upstream origin correct-branch-name

  最后再git pull就可以了

• 合并上一个提交

git commit --amend --no-edit