From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: MORE: Using git via USB for personal org dir and other data files Date: Sat, 28 Feb 2009 23:10:50 -0500 Message-ID: <87r61hann9.fsf@legolas.norang.ca> References: <7bef1f890902272111l7611d157k984ca50251f20df6@mail.gmail.com> <871vti7klg.fsf@gollum.intra.norang.ca> <87r61ie3h9.fsf@kassiopeya.MSHEIMNETZ> <87skly5o18.fsf@gollum.intra.norang.ca> <87fxhydxll.fsf@kassiopeya.MSHEIMNETZ> <87eixi6o9x.fsf@kassiopeya.MSHEIMNETZ> <7bef1f890902281810n1ccda333yada4e62082bd92c8@mail.gmail.com> <87zlg655pk.fsf@kassiopeya.MSHEIMNETZ> <7bef1f890902281903xa296051xa844059dd4e392a7@mail.gmail.com> <7bef1f890902281904n48e02018lb7935e4defd8fe66@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ldd0z-0001RB-W2 for emacs-orgmode@gnu.org; Sat, 28 Feb 2009 23:10:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ldd0y-0001QM-P5 for emacs-orgmode@gnu.org; Sat, 28 Feb 2009 23:10:57 -0500 Received: from [199.232.76.173] (port=34607 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ldd0y-0001QF-Bl for emacs-orgmode@gnu.org; Sat, 28 Feb 2009 23:10:56 -0500 Received: from mho-02-bos.mailhop.org ([63.208.196.179]:59756) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ldd0y-0006nA-7H for emacs-orgmode@gnu.org; Sat, 28 Feb 2009 23:10:56 -0500 In-Reply-To: <7bef1f890902281904n48e02018lb7935e4defd8fe66@mail.gmail.com> (Alan E. Davis's message of "Sun\, 1 Mar 2009 13\:04\:25 +1000") 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: "Alan E. Davis" Cc: emacs-orgmode Mailinglist "Alan E. Davis" writes: > =C2=A0Thank you Bernt (and Sebastian): > I'm just trying to help :) > > I now understand that it is necessary to pull the changes to the alternat= e tree before pushing.=C2=A0 This will make a big > difference in the future, I believe.=C2=A0 It worked as advertized on the= /tmp/junk experiment.=C2=A0 Great! > > > I think the other point I had missed, that would be necessary in an FAQ o= r tutorial, is that it is necessary to initially > clone each of the working trees, on each machine, from the bare repo on t= he USB flash drive.=C2=A0 Then it now makes sense to > me to name that as org.git, to distinguish it as a bare repo.=C2=A0 And o= nce the working trees are cloned from there, then the > org.git on the USB drive is recognized automatically as "origin".=C2=A0 T= hat point eluded me.=C2=A0=C2=A0 And that git pull will perhaps > automatically find origin. git pull and git push use the default remote 'origin' if none is specified. > > Meld is starting to make sense too.=C2=A0 Thought it would be nicer to ha= ve a tool that would be able to make simple updates > from two edits on the same file if they don't conflict.=C2=A0 Usually, th= is will not be the case. > > Now, is it useful to use the switches on an ext2 formatted USB drive, as = follows? > > =C2=A0=C2=A0=C2=A0 $ git clone -l --no-hardlinks --bare . /path/to/usb/st= ick I've never used -l --no-hardlinks when creating repos on my usb stuck. vfat filesystems don't support hard links and you can't make use of hard links across filesystems. There is lots of information available from git man pages (ie. git clone --help) which describes what all of the options do. Regards, Bernt