From: Bernt Hansen <bernt@norang.ca>
To: Jude DaShiell <jdashiel@shellworld.net>
Cc: emacs-orgmode@gnu.org
Subject: Re: getorg.sh script
Date: Thu, 28 Jul 2011 17:39:25 -0400 [thread overview]
Message-ID: <8739hqccfm.fsf@norang.ca> (raw)
In-Reply-To: <alpine.BSF.2.00.1107281732100.12506@freire1.furyyjbeyq.arg> (Jude DaShiell's message of "Thu, 28 Jul 2011 17:34:43 -0400 (EDT)")
> 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 necessary.
>>
>> If you've messed up your local master branch somehow and want to revert
>> back to the official 'master' branch then just
>>
>> $ git checkout master
>> $ git reset --hard origin/master
>>
>> which throws away any local commits and uncommitted changes in your
>> working directory.
>>
>> I fail to understand why you would ever need this script. Can you
>> please elaborate?
>>
Jude DaShiell <jdashiel@shellworld.net> writes:
> 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.
Okay - there's an article on Worg about keeping local changes on top of
org-mode development (basically you commit your Makefile changes and
always rebase on top of origin/master -- which happens automatically
when you merge with git pull)
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
$ git checkout master
$ git reset --hard origin/master
and then redo your Makefile changes instead of recloning.
Let me know if I can provide any information to make this less painful
for you.
Regards,
Bernt
next prev parent reply other threads:[~2011-07-28 21:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 9:56 getorg.sh script Jude DaShiell
2011-07-28 14:04 ` Bernt Hansen
2011-07-28 21:34 ` Jude DaShiell
2011-07-28 21:39 ` Bernt Hansen [this message]
2011-07-28 21:50 ` suvayu ali
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8739hqccfm.fsf@norang.ca \
--to=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
--cc=jdashiel@shellworld.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.