Re: [O] getorg.sh script

2011-07-28 Thread suvayu ali
Hi Jude, On Thu, Jul 28, 2011 at 11:39 PM, Bernt Hansen wrote: > If that happens and you get a conflict you don't know how to deal with > and you're willing to reedit your Makefile changes (which you would have > to do anyway if you get a fresh clone) then you can just nuke everything > with > >

Re: [O] getorg.sh script

2011-07-28 Thread Bernt Hansen
> On Thu, 28 Jul 2011, Bernt Hansen wrote: > >> In what situations does org-mode update fail? I've never had to reclone >> the org-mode repository - ever. If git update fails, just do it again. >> Recloning means you need to download all of the objects for org-mode >> again which should never be

Re: [O] getorg.sh script

2011-07-28 Thread Jude DaShiell
Whenever I apply a patch to the Makefile an orgmode update fails since my local changes have to be stashed or commited according to git. It's the merge step that fails. I probably know less about git than I ought to, but that's what's happened over here. On Thu, 28 Jul 2011, Bernt Hansen wrot

Re: [O] getorg.sh script

2011-07-28 Thread Bernt Hansen
Jude DaShiell writes: > These days I use this when an org-mode update fails and I have to erase > the whole org-mode directory tree and clone org-mode again. > Cut here. > > #!/bin/bash > #file getorg.sh - run git to update local org repository. > if [ -r ~/org-mode ]; then > echo "updating e

[O] getorg.sh script

2011-07-28 Thread Jude DaShiell
These days I use this when an org-mode update fails and I have to erase the whole org-mode directory tree and clone org-mode again. Cut here. #!/bin/bash #file getorg.sh - run git to update local org repository. if [ -r ~/org-mode ]; then echo "updating emacs-org-mode" cd org-mode git pull mak