pull† + push, that's it, nothing more.
† that is fetch + merge or fetch + rebase depending on the branch.<branchname>.rebase git config entry