Pulling
- To bring the changes in a remote repository into our local repository, most of the time, we have to do a fetch, followed by a merge. So we have a command that combines the two, it's the
pull
git pull
- If the branches are diverged, Git is going to perform a three-way merge to bring the remote changes into our master branch
git pull --rebase
- Rebase is replaying our local changes on top of changes made by others, with this we will have simple linear history.