95% translated 3.6 Git Branching - Rebasing
translate the last sentence according to #12
全部改成衍合；根据大家的建议做了修订
Merge pull request #12 from shuaishuai/3.6

translate 3.6 Git Branching - Rebasing