If you can hang with it being in emacs, magit is phenomenal and makes a lot of the harder things (rebase, conflict resolution, etc.) in git easier.

Lightning talk: https://www.youtube.com/watch?v=4ccCNQaTJ10

also, if you are a vimmer use spacemacs to get out of the box, nicely configured vim.

Gitup for the Mac http://gitup.co

Definitely my favourite client, and OSS to boot. I can't really think of much I'd want changed to improve it.

Thanks for this. Apparently I have the Github repo starred but missed out using it. The features look impressive.

Gitup.co is nice

tig. It's been under active development for over 10 years now. https://github.com/jonas/tig

> Definitely better than Github desktop

Not really a fair comparison: SourceTree targets professional devs while GitHub Desktop caters to making git + GitHub simple for beginners. I like the client personally, but it isn't a daily driver. Beyond absolute basics the feature set is totally different.

I'm a big fan of SmartGit http://www.syntevo.com/smartgit/

+1 Smartgit's community edition is fully functional.

GitKraken looks promising, and introduces some new UI concepts (drag and drop merging, for example). It's still fairly young but could be a competitor.

I've been using Fork (git-fork.com), and it's fantastic. Similar UI to SourceTree on the surface, but more obvious in other ways. It's blazing fast, and the author is super responsive to requests and to make fixes.

Thanks for the recommendations, I'll check them out.

Checkout gitkraken. Really easy to use. Cleaner interface than sourcetree with almost all the features.

Gitkraken is amazing

Except that they have recently done an about turn on their licensing, and what used to be a FREE product is now a charge for product.

No problems with paying for a product, but the way they went about the switch left a sour taste, so I went back to SourceTree.

Fair enough, I'm only using it for personal projects, so I can see how that'd be annoying.