Git Rebase
When you need to get changes from another branch, there are two ways do it -
First is using merge
, which will apply the commits and create a merge commit in the current branch.
Other way is to use rebase
, which will apply your commits on top of the commits from other branch. Unlike merge, rebasing will keep the commit history clean.