Fork, a fast and friendly git client for Mac and Windows. GH notifications right on your desktop, interactive rebase and the merge-conflict helper/resolver looks really great.