Github

feature branch


  1. update to latest version
git checkout master
git pull origin master
  1. create feature branch
git checkout -b add_linting
  1. modify code
  2. push
git push origin add_linting
  1. create pull request

merge multi commit


git rebase -i HEAD~3

copy file from other branch


git checkout [branch] [file]

reset rebase


git reflog
git reset --hard HEAD@{4}

参考文档