Where merge combines two histories by tying them together with a new merge commit, rebase moves your commits so they appear to have been written on top of the latest code
git workflow
Where merge combines two histories by tying them together with a new merge commit, rebase moves your commits so they appear to have been written on top of the latest code