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

Rebase v.s. fast forward

From
AAlan <alan@clueserver.org>
Date
Feb 17, 2009, 23:50 UTC
Message-ID
<1234914604.3334.7.camel@rottwang.fnordora.org>

I am dealing with a kernel branch of a branch that undergoes frequent rebases and I want to know the easiest way of handling things.

The tree is pulled from kernel.org. Patches are applied to the tree by a developer here on a branch. I take that branch, make my own branch, add drivers and other modifications and publish to a different repo.

Now that 2.6.29 is occurring, every time there is a new RC candidate, he rebases the tree and tells everyone to rebuild. Since the developers on my projects have their own branches off of my tree, rebuilding everything is starting to look like a big pain.

Is there a way to take a rebased repository and apply the changes in a manner that does not require reconstructing everything from patches?

Can you fast forward on a rebased repo or are you just hosed? (Or would that be considered "frebasing"?)

Next: Jan Hudec
Message 1 of 2 in “Rebase v.s. fast forward”
  1. AlanFeb 17, 2009
  2. Jan HudecFeb 22, 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.