When I first started making the switch from TFS to GIT, I had some trouble adjusting to the way git works and how all the commands colarate.

Branching and Merging

When you want to merge changes from the master into your feature branch, use the following commands.

git checkout master
git pull
git checkout featurebranch
git rebase master
git push -f

Note: The last command will force push your code to the server.

Discarding local commits

When you want to dscard all your local commits on a branch, use the following command

git reset --hard @{u}

Checkout remote branch

When you want to checkout a remote branch, you first need to fetch it.

git fetch
git checkout <featurebranch>

Hope this helps!