Cola Git GUI
A highly caffeinated Git GUI
Git-cola is a git GUI optimized for working with the git index. It includes a custom git command called git-difftool that allows you to stage changes using the standard git merge tools.
Git-cola can compare arbitrary commits using standard merge tools. With it you can search commit messages, content, authors, paths, data ranges etc. and it makes it easy to interactively edit the index.