typo
Merge pull request #21 from shuaishuai/3.6_fix

3.6 Git Branching - Rebasing 格式错误