emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bernt Hansen <bernt@norang.ca>
To: nicholas.dokos@hp.com
Cc: Nicolas Goaziou <n.goaziou@gmail.com>, Org-mode <emacs-orgmode@gnu.org>
Subject: Re: Links in tables and LaTeX export
Date: Tue, 05 Jul 2011 19:36:51 -0400	[thread overview]
Message-ID: <87liwcxpt8.fsf@norang.ca> (raw)
In-Reply-To: <25027.1309908394@alphaville.americas.hpqcorp.net> (Nick Dokos's message of "Tue, 05 Jul 2011 19:26:34 -0400")

Nick Dokos <nicholas.dokos@hp.com> writes:

> Bernt Hansen <bernt@norang.ca> wrote:
>> Nick Dokos <nicholas.dokos@hp.com> writes:
>> > Thomas S. Dye <tsd@tsdye.com> 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 
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.

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.


  reply	other threads:[~2011-07-05 23:36 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 [this message]
2011-07-05 23:46             ` Nick Dokos
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:

  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=87liwcxpt8.fsf@norang.ca \
    --to=bernt@norang.ca \
    --cc=emacs-orgmode@gnu.org \
    --cc=n.goaziou@gmail.com \
    --cc=nicholas.dokos@hp.com \


* 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


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