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

Re: Rebase a whole tree from one commit to another?

From
Clemens Buchacher <drizzd@aon.at>
Date
May 16, 2009, 13:49 UTC
Message-ID
<20090516134906.GA19110@localhost>
In-Reply-To
<4A0DC4CD.1030401@dirk.my1.cc>
On Fri, May 15, 2009 at 09:38:53PM +0200, Dirk Süsserott wrote:
Show 5 quoted lines
>
>     git rebase new-master branch-a
>     git rebase branch-a   branch-b
>     git rebase branch-b   branch-c
>
You probably want something like
	git rebase new-master branch-a
	git rebase --onto branch-a branch-a@{1} branch-b
	git rebase --onto branch-b branch-b@{1} branch-c

instead, because if you have any conflicts during rebase, the rebased commits will no longer be recognized as identical, causing even more conflicts in the following rebases.

Previous: Andreas Ericsson
Message 3 of 3 in “Rebase a whole tree from one commit to another?”
  1. Dirk SüsserottMay 15, 2009
  2. Andreas EricssonMay 16, 2009
  3. Clemens BuchacherMay 16, 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.