I use git on development machines and have an rsync script to push updates to the server.