From: tsd@tsdye.com (Thomas S. Dye)
To: nicholas.dokos@hp.com
Cc: Bernt Hansen <bernt@norang.ca>, Org-mode <emacs-orgmode@gnu.org>,
Nicolas Goaziou <n.goaziou@gmail.com>
Subject: Re: Links in tables and LaTeX export
Date: Tue, 05 Jul 2011 14:26:30 -1000 [thread overview]
Message-ID: <m1box8l0eh.fsf@tsdye.com> (raw)
In-Reply-To: <25210.1309909581@alphaville.americas.hpqcorp.net> (Nick Dokos's message of "Tue, 05 Jul 2011 19:46:21 -0400")
Nick Dokos <nicholas.dokos@hp.com> writes:
> Bernt Hansen <bernt@norang.ca> wrote:
>
>> Assuming his has local commits buried in his history somewhere Tom can
>> 'fix' it by doing
>>
>> $ git checkout master
>> $ git reset --hard origin/master
>> $ git cherry-pick <whatever local commits he wants to keep>
>>
>> so the new commits are on top of origin/master, and set his master
>> branch to automatically rebase on pulls as described in the link above.
>>
>
> Yup, now that you mention it, I think the first two steps is how I recovered
> (I try to keep a pristine master and do local work in branches, but I
> must have goofed up my master branch in that instance).
>
> Thanks,
> Nick
>
>
Aloha Nick and Bernt,
Thanks much for the explanation. git reset --hard origin/master appears
to have restored a pristine tree. I pulled just now and didn't generate
my own commit in the process, so with a little discretion I can keep it
that way.
All the best,
Tom
--
T.S. Dye & Colleagues, Archaeologists
735 Bishop St, Suite 315, Honolulu, HI 96813
Tel: 808-529-0866, Fax: 808-529-0884
http://www.tsdye.com
prev parent reply other threads:[~2011-07-06 0:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 1:58 Links in tables and LaTeX export Thomas S. Dye
2011-07-05 3:10 ` Nick Dokos
2011-07-05 10:07 ` Bastien
2011-07-05 10:10 ` Nicolas Goaziou
2011-07-05 12:03 ` Nicolas Goaziou
2011-07-05 15:06 ` Nick Dokos
2011-07-05 15:18 ` Thomas S. Dye
2011-07-05 17:03 ` Nick Dokos
2011-07-05 22:58 ` Bernt Hansen
2011-07-05 23:26 ` Nick Dokos
2011-07-05 23:36 ` Bernt Hansen
2011-07-05 23:46 ` Nick Dokos
2011-07-06 0:26 ` Thomas S. Dye [this message]
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1box8l0eh.fsf@tsdye.com \
--to=tsd@tsdye.com \
--cc=bernt@norang.ca \
--cc=emacs-orgmode@gnu.org \
--cc=n.goaziou@gmail.com \
--cc=nicholas.dokos@hp.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).