Git merge combines the commits from one branch to another, while git rebase applies the commits from one branch to another.