emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Nick Dokos <nicholas.dokos@hp.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Nicolas Goaziou <n.goaziou@gmail.com>,
	nicholas.dokos@hp.com, Org-mode <emacs-orgmode@gnu.org>
Subject: Re: Links in tables and LaTeX export
Date: Tue, 05 Jul 2011 19:46:21 -0400	[thread overview]
Message-ID: <25210.1309909581@alphaville.americas.hpqcorp.net> (raw)
In-Reply-To: Message from Bernt Hansen <bernt@norang.ca> of "Tue, 05 Jul 2011 19:36:51 EDT." <87liwcxpt8.fsf@norang.ca>

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

next prev parent reply	other threads:[~2011-07-05 23:46 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 [this message]
2011-07-06  0:26               ` Thomas S. Dye

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=25210.1309909581@alphaville.americas.hpqcorp.net \
    --to=nicholas.dokos@hp.com \
    --cc=bernt@norang.ca \
    --cc=emacs-orgmode@gnu.org \
    --cc=n.goaziou@gmail.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

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).