git clone
git branch hotfix@tianli
git checkout hotfix@tianli
modify code
git commit –a
arc diff
git checkout master
git pull
git checkout hotfix@tianli
git rebase master
git checkout master
git merge hotfix@tianli
git push
next round …