Git extensions- Free GUI for git. Personally, more complete and closer to git's methodology than smartgit. Basically, it tells you everything and gives you a GUI for almost any function of git without doing anything on its own.

I am using Visual Studio and the Extension "PHP Tools for Visual Studio", wich is somewhat really cool.
It is not free though. You can get Visual Studio if you are student for free, otherwise there is a new free version. Haven't tried it out yet.
And you also have to pay for the extension after a test period, but for me it is really worth it.

I really like the direct integration in the best IDE I've ever used. Maybe that's cause I use it at work, but since I use this, I've improved many of my development processes very drastically.

In times of change, learners inherit the earth, while the learned find themselves beautifully equipped to deal with a world that no longer exists - Eric HofferFormer Modifications/Extensions Team Member | My extensions
Appreciate the extensions/mods/support then buy me a beer
All requests for support via PM will be ignored

nice list of tools, just want to recommend this free tool Called USB Webserver for local server via USB

What is USBWebserver?

USBWebserver is a combination of the popular webserver software: Apache, MySQL, Php and PhpMyAdmin. With USBWebserver it is possible to develop and show your php websites, everywhere and anytime The advantage of USBWebserver is, you can use it from USB of even CD

USBWebserver is perfect for:

Show a offline version of your website
Anywhere and anytime develop php websites
No need for expensive hosting
Working at multiple locations at projects
A good test before putting your website online
And many more

All empty spaces at the end of lines are removed and double empty lines as well.git-stripspace does the cleaning, git-ls-files safely selects all the files from the repository (and leaves the .git directory alone). sponge from moreutils makes it possible to use a file as input and output at the same time.

Aptana Studio is really good. I used to use Geany, but now I wouldn't give up Aptana for anything... probably... well, ok, maybe for a robotic monkey that can cook, and accompany me on my quests to that dangerous place called 'outdoors'.

Aptana is a fork of Eclipse, trimmed down and polished up, focusing on web technologies almost exclusively. The built-in goodies like the SFTP using key auth is nice, as is the configurable syntax highlighting / coloring. My only complaint is that I haven't found a solution to adapt the syntax highlighting & code assist to play nicely with PHPBB. One would think that defining a few custom rules for syntax would be easy-peasy. Wrong.