http://blog.yorkxin.org/posts/2011/07/29/git-rebase/ Merge or Rebase? what's is the different between git rebase and git meger.