Git

Create Local Git Repo

Go into the project folder and type:

git init

Add files to Repo

git add .

Create a commit

git commit -m "First Commit"

Link local repo to remote repo

git remote add origin <path to remote repo>

Verify remote repo

git remote -v

Push files to repo

git push origin master

Get Status

git status

Create a new branch and checkout to it

git checkout -b bfv1.01

or...

git branch bfv1.01

git checkout bfv1.01

Switch Branch to master (trunk)

git checkout master

Note!Always add then commit or stash before switching branches

Switch Branch to bfv1.01

git checkout bfv1.01

Merge bfv1.01 code to master

git checkout master

git merge bfv1.01

Delete bfv1.01 branch

git branch -d bfv1.01

Rebase branch

git checkout bugfixV1.01

git rebase master

Gets latest list of remote branches
and prune local ones that do not exist on remote

git remote update origin --prune

Looking at differences in a file in two different branches in Visual Studio (Even with no commit history between them)

Set up your visual studio diff and merge tools on git as per these instructions then run:

git difftool <branch1> <branch2> <Path to file>