Question d’entretien chez Imaginary Cloud

Difference between git merge and git rebase?