+1 for Sublime Merge, I use it every day and love it. Also seems to be one of the few git clients with Linux support, surprisingly.