git套路

push代码到主线：

git add .

git commit -m "update comment"

git push origin HEAD:refs/for/trunk

git pull origin --rebase trunk

pull代码从远程仓库：

git pull origin refs/heads/trunk:trunk

cherry-pick套路：

git log -3;

git cherry-pick xxxxx

git commit --amend --no-edit

git push origin HEAD:refs/for/trunk