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

Re: Q: rebasing (moving) a whole tree (not just one branch)

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 18, 2011, 21:14 UTC
Message-ID
<7vaagsw2qb.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110318202637.GA23255@elie>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 18 quoted lines
> Dirk Süsserott wrote:
>
>> I'd like to rebase a whole tree from A to B. Not just a single
>> branch, but a whole tree. Let's say I have the following history:
>>
>> --- A --- B
>>     |
>>     + -- C -- D
>>          |
>>          + E -- F
>> 
>> I'd like to rebase C and its descendants from A to B
>
> I'd suggest cheating by making a merge of D and F and "rebase -p"-ing
> that. :)
>
> To say something more sensible would probably require more information
> about the particular application, though.

I am not a huge fan of filter-branch, but shouldn't you be able to filter-branch D and F (and no other branch) on top of B?

Previous: Jonathan NiederNext: Jonathan Nieder
Message 3 of 5 in “Q: rebasing (moving) a whole tree (not just one branch)”
  1. Dirk SüsserottMar 18, 2011
  2. Jonathan NiederMar 18, 2011
  3. Junio C HamanoMar 18, 2011
  4. Jonathan NiederMar 18, 2011
  5. Johannes SixtMar 18, 2011

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.