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

Very complex rebasing - Need help

From
JJehreg <jehreg@gmail.com>
Date
Sep 8, 2006, 13:27 UTC
Message-ID
<6208897.post@talk.nabble.com>

So, I grabbed a tarball of the Buildroot project a year ago and started a git repo, and created a branch and did changes:

initial---master
              \
                --o--o--o--o--myproject

A few months later, I grabbed another Buildroot tarball and I diffed it from my master and applied it to master.

initial--o--(new tarball)--master
          \
           --o--o--o--o--myproject
Which I then merged into myproject and did some additional development.
initial--o--(new tarball)--o--master
          \                      \
           --o--o--o--o--o----o--o--o--o--myproject

My problem is that I would like to bring in the svn-into-git repo of the Buildroot project.

initial--ID1--(new tarball)--ID2--master
          \                          \
           --o--o--o--o--o-----o--o--o--o--myproject
other repo of the Buildroot project:
initial--o--o--ID3--o--o--ID4--o--master
So, I can actually match ID1=ID3 and ID2= ID4.
I can use rebase to do this:
In the Buildroot repo:
initial--o--o--ID3--o--o--ID4--o--master
                  \
                   --o--o--o--o--o--o--o--o--myproject

My problem is that I need to kinda-rebase the ID4 into the myproject branch to make it finally look like this:

initial--o--o--ID3--o--o--ID4--o--master
                  \               \
                   --o--o--o--o--o--o--o--o--myproject
Any ideas ?
-- 
View this message in context: http://www.nabble.com/Very-complex-rebasing---Need-help-tf2239083.html#a6208897
Sent from the git forum at Nabble.com.
Next: Jakub Narebski
Message 1 of 2 in “Very complex rebasing - Need help”
  1. JehregSep 8, 2006
  2. Jakub NarebskiSep 8, 2006

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.