Git

To pull and merge master from origin without leaving the current branch: git fetch origin master:master

To push a new branch to origin (assuming it's checked out now): git push -u origin HEAD