[kyleslattery]

You can even collapse the first one into a single command: "git pull remotename master"

[raimondious]

And the second one too: "git pull --rebase remotename master"

[_ikke_]

Note that in this case, your remote tracking branches wont be updated, so git status will say you are ahead of the remote, while you are in fact at the same point.

A "git fetch <remote>" would then update the remote tracking branches.