git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Rewrite history then pull repository?

From
Graeme Geldenhuys <graemeg@gmail.com>
Date
Jul 13, 2009, 09:38 UTC
Message-ID
<h3evbh$r8n$1@ger.gmane.org>
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/
Previous: Thomas Rast
Message 3 of 3 in “Rewrite history then pull repository?”
  1. Graeme GeldenhuysJul 13, 2009
  2. Thomas RastJul 13, 2009
  3. Graeme GeldenhuysJul 13, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.