git

[git]merge和rebase的区别 - 削微寒 - 博客园

http://www.cnblogs.com/xueweihan/p/5743327.html