NetBeans 7 supports git. The git plugin has to be installed first (Tools->Plugins and search for git). The installation is fast (the plugin is < 1MB).
- git plugin supports: Show Changes, Add, Commit, Diff, Branches, Checking out a revision, Merging, Fetch and Disconnect
- Repository browser: (Team -> Git -> Repository Browser)
- Bug tracking integration (in the commit panel)
- My favorite: NetBeans "downlights" files included in .gitignore
NEW: Online Workhop Effective WebApps without Frameworks is also coming to: MUC Airport.