Also, if you're an IntelliJ user: their Git integration is very, very good.Though you have to jump through a few hoops if you want to combine with the Cygwin approach: on Windows IntelliJ will target the git .exe file, whereas Cygwin uses the *nix implementation of Git.
Max