From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Dokos <nicholas.dokos@hp.com>
Subject: Re: Links in tables and LaTeX export
Date: Tue, 05 Jul 2011 19:46:21 -0400
Message-ID: <25210.1309909581@alphaville.americas.hpqcorp.net>
References: <m17h7xqyj7.fsf@tsdye.com> <87vcvhlysk.fsf@gmail.com>
	<m1y60cpxgy.fsf@tsdye.com>
	<31665.1309885396@alphaville.dokosmarshall.org>
	<87pqloxrkw.fsf@norang.ca>
	<25027.1309908394@alphaville.americas.hpqcorp.net>
	<87liwcxpt8.fsf@norang.ca>
Reply-To: nicholas.dokos@hp.com
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:36765)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nicholas.dokos@hp.com>) id 1QeFJy-00012U-97
	for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 19:46:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <nicholas.dokos@hp.com>) id 1QeFJw-0004QK-Aw
	for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 19:46:25 -0400
Received: from g4t0014.houston.hp.com ([15.201.24.17]:39686)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <nicholas.dokos@hp.com>) id 1QeFJv-0004Pk-Kn
	for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 19:46:23 -0400
In-Reply-To: Message from Bernt Hansen <bernt@norang.ca>
	of "Tue, 05 Jul 2011 19:36:51 EDT." <87liwcxpt8.fsf@norang.ca>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Bernt Hansen <bernt@norang.ca>
Cc: Nicolas Goaziou <n.goaziou@gmail.com>, nicholas.dokos@hp.com, Org-mode <emacs-orgmode@gnu.org>

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