From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: Using Git to update more than one machine (one without network access) Date: Wed, 25 Feb 2009 13:41:25 -0500 Message-ID: <87eixmwe96.fsf@gollum.intra.norang.ca> References: <49A582C2.3090407@manor-farm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LcOhI-0003pU-22 for emacs-orgmode@gnu.org; Wed, 25 Feb 2009 13:41:32 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LcOhH-0003pI-AY for emacs-orgmode@gnu.org; Wed, 25 Feb 2009 13:41:31 -0500 Received: from [199.232.76.173] (port=51275 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LcOhH-0003pE-4S for emacs-orgmode@gnu.org; Wed, 25 Feb 2009 13:41:31 -0500 Received: from mho-02-bos.mailhop.org ([63.208.196.179]:62592) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LcOhG-0007hf-Qy for emacs-orgmode@gnu.org; Wed, 25 Feb 2009 13:41:30 -0500 In-Reply-To: (Paul Mead's message of "Wed\, 25 Feb 2009 18\:19\:20 +0000 \(UTC\)") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Paul Mead Cc: emacs-orgmode@gnu.org Paul Mead writes: > Ian Barton manor-farm.org> writes: > >> >> Use git clone to create a repo on your usb stick. >> >> Pull changes from Carsten' git repo to your usb stick. >> >> Pull changes from your usb stick to both your work and home computers. >> In other words your usb stick is your own master repo. >> > > It works! Well, in the ansence of any changes to pull it seems to work anyway. Hi Paul, I suggest you put bare repositories on the USB stick. On your home machine that has internet access $ git pull # to update from git.or.cz Create a bare clone (once) of your repo on the usb stick $ git clone --bare . /path/to/usb/org-mode.git Define a remote repo on the USB stick $ git remote add usb /path/to/usb/org-mode.git $ git push usb [master and any other branches you want] After that you can $ git fetch usb on your workstation to update any new commits on the usb stick $ git push # update any existing branches on the usb stick On your work machine just clone the USB repo $ git clone /path/to/usb/org-mode.git and you should be all set. I have all my active repos as bare clones on my 4GB USB stick including git.git, org-mode.git, my org files, and a bunch of other projects - so when I'm leaving I grab my laptop, load the USB stick from my workstation with a script (usb-git-push) and then walk out the door with my laptop and my USB stick. I can pull from the USB stick into my laptop after I'm gone. Synching the other way is similar. On the laptop push to the USB stick, take the stick to my workstation and git fetch from it. Then I merge the usb/master and master (and other topic branches) appropriately. HTH, Bernt