Here's my toolchain of choice for using git on the mac:

Tower ( is simply awesome.

Diffmerge ( tames those horrible merge conflicts.

Kaleidoscope ( 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.