159. What is the difference between `git merge` and `git rebase`?

This is a very basic question about git, if still unfamiliar, read this post.