From mboxrd@z Thu Jan 1 00:00:00 1970 From: tsd@tsdye.com (Thomas S. Dye) Subject: Re: Links in tables and LaTeX export Date: Tue, 05 Jul 2011 14:26:30 -1000 Message-ID: References: <87vcvhlysk.fsf@gmail.com> <31665.1309885396@alphaville.dokosmarshall.org> <87pqloxrkw.fsf@norang.ca> <25027.1309908394@alphaville.americas.hpqcorp.net> <87liwcxpt8.fsf@norang.ca> <25210.1309909581@alphaville.americas.hpqcorp.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([140.186.70.92]:59489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeFwu-00062p-Bk for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 20:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeFwt-0001cp-3A for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 20:26:40 -0400 Received: from oproxy7-pub.bluehost.com ([67.222.55.9]:40015) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QeFws-0001cY-Q1 for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 20:26:39 -0400 In-Reply-To: <25210.1309909581@alphaville.americas.hpqcorp.net> (Nick Dokos's message of "Tue, 05 Jul 2011 19:46:21 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: nicholas.dokos@hp.com Cc: Bernt Hansen , Org-mode , Nicolas Goaziou Nick Dokos writes: > Bernt Hansen 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 >> >> 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