Git Wisdom of the Ages

Make sure you have a .gitignore

workspace
Android/local
Blackberry/local
JavaCommon/local
JavaCommonTest/local
*/local.properties
*/.project
*/.classpath
*/.settings
*/bin
*/gen
*.tgz
todo.*

Short cheat sheet of git commands

Don't use any other commands or options.

git clone repoURL --- initial checkout

git add file --- adds a file to git. If you create new files in your local copy but don't tell git about them then git won't manage them

git rm file --- removes a file from the current branch of git and deletes it off your file system.

git pull --- tries to merge the copy of the repository stored on the server (or whatever remote repository you have configured) with the current branch of your local copy

git commit -m "What the change is" --- commits the changes you've made to your current local branch.

git push upload master --- pushes the current branch to the remote master branch

git status --- see changes that would happen if you did a commit