My current git setup:
- Git Fork for committing, pushing
- P4 Merge for resolving conflicts (it's not a pretty app, but the fantastic feature set more than makes up for the non-native look)
- GitUp for reordering, editing and splitting commits
- Command line for the rare things the GUIs can't do
None of those cost money and I don't understand how these awesome apps are all free. I would pay for all of them, they are much better than Tower.