Assuming you set the upstream (as in the "setting an upstream repository")
git fetch remote-name
git merge remote-name/branch-name
The pull
command combines a fetch
and a merge
.
git pull
The pull
with --rebase
flag command combines a fetch
and a rebase
instead of merge
.
git pull --rebase remote-name branch-name