I should say I'm happy with how NetBeans Git client works. It offers good performance and resolves conflicts pretty well.
It shows a list of pending changes and also changes colour for changed file name:
Changes can be committed into local repository through informative wizard: Read the complete article here.
For regular information become a member in the WebLogic Partner Community please visit: http://www.oracle.com/partners/goto/wls-emea ( OPN account required). If you need support with your account please contact the Oracle Partner Business Center.