https://www.atlassian.com/git/tutorials/merging-vs-rebasing

之前很少用 git rebase, 看了这篇文章之后清晰了不少。