git clean

git has a nice switch to clean untracked and/or ignored files. git help clean for more info.

Git GUI Fails to Load on OS X and How to Solve It

I don't use git gui much, I mainly prefer the command line or magit or GitX, but git gui might be useful sometimes, especially with the OpenInGitGui Finder extension. 

When installed, git gui by default doesn't work (at least on my Macbook running Leopard); and fails with the message: 

dyld: Library not loaded: /Library/Frameworks/Tk.framework/Versions/8.5/Tk Referenced from: /usr/local/git/share/git-gui/lib/Git Gui.app/Contents/MacOS/Wish Reason: image not found error: git-gui died of signal 5

Clearly, the Tk framework 8.5 is missing and can be downloaded from here. (Also see here) Once that is installed, everything works properly.

Some Git Tips

1. git add -u to add all modified files in the index.
2. git checkout -f to trash all uncommitted changes. Useful before pulling.
3. git stash as an alternative to above.
4. git diff --cached to see the added changes.
5. git rebase to squash multiple commits into a commit before pushing. Rebasing is useful for other stuff, but that needs more exploration.   git rebase -i origin/master to merge all unpushed commits.
6. git commit --amend might be an alternative for that as well. 
7. See here for some other tips.

Git Tips

Some useful pages on Git: 1 - http://blog.ericgoodwin.com/2008/4/10/auto-completion-with-git 2 - http://www.benmabey.com/2008/05/07/git-bash-completion-git-aliases/