Here's my toolchain of choice for using git on the mac:
Tower (http://www.git-tower.com/) is simply awesome.
Diffmerge (http://www.sourcegear.com/diffmerge/) tames those horrible merge conflicts.
Kaleidoscope (http://www.kaleidoscopeapp.com/) makes viewing diffs nice.
Diffmerge and Kaleidoscope integrate nicely with Tower, for a nice workflow.
Thanks for reading! And if you want to get in touch, I'd love to hear from you: chris.hulbert at gmail.
(Comp Sci, Hons - UTS)
iOS Developer in Sydney.
I have worked at places such as Google, Cochlear, News Corp, Fox Sports, NineMSN, FetchTV, Woolworths, and Westpac, among others. If you're looking for a good iOS developer, drop me a line!