In the previous post I wrote about possibility of Git support in NetBeans. The team that implements it got valuable feedback from php users and now is available a version of this support on development update center. You can install it in a development build through plugin manager.
I hope that the plugin will satisfy what you need. The plugin is still under active development, but should be usable and if something doesn't fit your needs, please report it in our bugzilla.