It depends a bit on what you already have on your live site.
I think you should make a distinction between working on the source code
using git repositories, and doing actual deployment of your site.
I think I would do something like this. First you want to set up a
reproducable/scriptable routine for deploying your site the way it is today:
1) Copy your live server's files to a local directory called "site" or
2) Initialize a git repo in this directory (cd site; git init)
3) Important: Take a backup of your live server's contents that you can
restore if you want to go back to the old way.
4) Clear out the live server (or move the old contents away or something)
5) Publish the site git repo to your server, if possible use a tool for this
like Capistrano <http://help.github.com/capistrano/>.
If you don't want to, or can't use Capistrano, you can use git
upload the archive to the server and unpack it manually.
Once you've done this, you can start working on your local site repo and
merge in the other changes you've been working on locally. And then repeat
the deployment routine. Post back here when you get to this step and need
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at