Question d’entretien chez Aventail

What is the difference between git rebase and git merge?