A lot of code is stored in mercurial so it might be worthwhile to learn it. It's quite easy.
If you don't have mercurial installed, install in your preferred way (apt-get, easy_install, pip). Then you only need a couple commands: To grab Web2py: $ hg clone https://code.google.com/p/web2py/ web2py To pull all new changes (but not update your working directory): $ hg pull To update your working directory to the latest: $ hg update To update your working directory to a specific changeset: $ hg update [changeset id] You can use git for your applications, no problem. This will be *much* easier than trying to sync in git. Good tutorials: http://hginit.com http://mercurial.selenic.com
