From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: Links in tables and LaTeX export Date: Tue, 05 Jul 2011 19:36:51 -0400 Message-ID: <87liwcxpt8.fsf@norang.ca> References: <87vcvhlysk.fsf@gmail.com> <31665.1309885396@alphaville.dokosmarshall.org> <87pqloxrkw.fsf@norang.ca> <25027.1309908394@alphaville.americas.hpqcorp.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([140.186.70.92]:56267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeFAo-0007h8-9D for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 19:36:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeFAm-0002uK-Jh for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 19:36:57 -0400 Received: from mho-04-ewr.mailhop.org ([204.13.248.74]:63489 helo=mho-02-ewr.mailhop.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeFAm-0002ty-4L for emacs-orgmode@gnu.org; Tue, 05 Jul 2011 19:36:56 -0400 In-Reply-To: <25027.1309908394@alphaville.americas.hpqcorp.net> (Nick Dokos's message of "Tue, 05 Jul 2011 19:26:34 -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: Nicolas Goaziou , Org-mode Nick Dokos writes: > Bernt Hansen wrote: > >> Nick Dokos writes: >> >> > Thomas S. Dye wrote: >> > > From what I gather, Tom is getting additional merge commits every time > he pulls (which accounts for the extras and the different SHA1). I think > I used to have that problem, but I don't any more, and I don't remember > (so what's new?) how it came about and/or I resolved it. Any ideas > about that? I may have just deleted the master branch and recreated > it. Tom should run gitk on his master branch - then the merge commits (if that is what they are) will be very obvious. If Tom create even a single commit in the past and then subsequently added new commits from origin/master with git pull then he'll get an extra merge commit for everytime he updates. There is a write up on worg about how to keep local commits on top of origin/master by rebasing the local commits each time git pull is run. http://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development 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. HTH, -- Bernt