Check out sublime merge, too. All the goodies from sublime text for a git frontend!