All of lore.kernel.org
 help / color / mirror / Atom feed
From: Graeme Geldenhuys <graemeg@gmail.com>
To: git@vger.kernel.org
Subject: Re: Rewrite history then pull repository?
Date: Mon, 13 Jul 2009 11:38:01 +0200	[thread overview]
Message-ID: <h3evbh$r8n$1@ger.gmane.org> (raw)
In-Reply-To: <200907131058.15118.trast@student.ethz.ch>

Thomas Rast wrote:
> 
> See the "Recovering From Upstream Rebase" section in man git-rebase,
> also available online at

Thanks for the link. Luckily I had a clone (backup) of my repository 
before the upstream rebase. So I could play around and see what happens 
to developers downstream. I used the 'gitk --all' to see the history and 
visualize what I had to do. I managed to figure out that 'git rebase 
origin' would solve the problem, and the documentation you mentioned 
confirmed that. :-)

Thanks again for the quick reply.


Regards,
   - Graeme -

-- 
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://opensoft.homeip.net/fpgui/

      reply	other threads:[~2009-07-13  9:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-13  8:42 Rewrite history then pull repository? Graeme Geldenhuys
2009-07-13  8:58 ` Thomas Rast
2009-07-13  9:38   ` Graeme Geldenhuys [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='h3evbh$r8n$1@ger.gmane.org' \
    --to=graemeg@gmail.com \
    --cc=git@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.