Git Kraken

Git Kraken is a graphical Git client that lets you view branches, commits and merge conflicts. Its fluid interface facilitates collaborative work and complex operations.