oXygen XML is my IDE of choice. I used to use Eclipse with the oXygen plugins put find myself using the actual oXygen IDE now as Eclipse is pretty heavy unless you are doing actual Java development. One of the other benefits has been that it had a Git client built in. Now the oXygen Editor has an add-on that incorporates a built-in Git client directly. Once the add-on is installed, a Git Staging view is available that includes various actions that perform common Git commands, such as push, pull, change branch, commit, and more. It also includes a built-in tool for comparing and merging changes!
To install the add-on:
1. Go to Help > Install new add-ons... to open an add-on selection dialog box.
2. Enter or paste https://raw.githubusercontent.com/oxygenxml/Oxygen-Git-Plugin/master/build/addon.xml