Pergunta de entrevista da empresa Alion

What is the difference between a merge and a rebase in Git?