Git

Add changes and upload to repo

• git add -u
• git add .
• git status
• git commit -m "A description of changes"
• git push

Pull from repo

• git pull

Remove from git

eg p/w file

• git rm myConfigFile
• echo myConfigFile > .gitignore
• git add .gitignore
• git commit -m "from now on, no more myConfigFile"

The other extreme approach (dangerous especially if you have already pushed your repo to a remote one) would be to entirely remove that file from the history of said repo:

• git filter-branch --index-filter 'git update-index --remove myConfigFile' HEAD

Merge branches

Quickest way:

git checkout master
git pull origin master
git merge test
git push origin master

Undo a commit

git commit -m "Something terribly misguided"             
git reset HEAD~   

Edit files as necessary

                      
git add .                                       
git commit -c ORIG_HEAD  

To restore everything back to the way it was prior to the last commit, we need to reset to the commit before HEAD:

git reset --soft HEAD^     # use --soft if you want to keep your changes
git reset --hard HEAD^     # use --hard if you don't care about keeping the changes you made