{"thread":{"id":"5516","subject":"Very complex rebasing - Need help","startedAt":"2006-09-08T13:27:38Z","lastAt":"2006-09-08T13:43:09Z","messageCount":2,"participants":["Jehreg","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"26581","messageId":"6208897.post@talk.nabble.com","threadId":"5516","inReplyTo":null,"subject":"Very complex rebasing - Need help","fromName":"Jehreg","fromEmail":"jehreg@gmail.com","sentAt":"2006-09-08T13:27:38Z","receivedAt":"2006-09-08T13:27:38Z","isPatch":false,"sender":{"key":"jehreg@gmail.com","avatar":null},"body":"\nSo, I grabbed a tarball of the Buildroot project a year ago and started a git\nrepo, and created a branch and did changes:\n\ninitial---master\n              \\\n                --o--o--o--o--myproject\n\nA few months later, I grabbed another Buildroot tarball and I diffed it from\nmy master and applied it to master.\n\ninitial--o--(new tarball)--master\n          \\\n           --o--o--o--o--myproject\n\nWhich I then merged into myproject and did some additional development.\n\ninitial--o--(new tarball)--o--master\n          \\                      \\\n           --o--o--o--o--o----o--o--o--o--myproject\n\nMy problem is that I would like to bring in the svn-into-git repo of the\nBuildroot project.\n\ninitial--ID1--(new tarball)--ID2--master\n          \\                          \\\n           --o--o--o--o--o-----o--o--o--o--myproject\nother repo of the Buildroot project:\ninitial--o--o--ID3--o--o--ID4--o--master\n\nSo, I can actually match ID1=ID3 and ID2= ID4.\n\nI can use rebase to do this:\n\nIn the Buildroot repo:\ninitial--o--o--ID3--o--o--ID4--o--master\n                  \\\n                   --o--o--o--o--o--o--o--o--myproject\n\nMy problem is that I need to kinda-rebase the ID4 into the myproject branch\nto make it finally look like this:\n\ninitial--o--o--ID3--o--o--ID4--o--master\n                  \\               \\\n                   --o--o--o--o--o--o--o--o--myproject\n\n\nAny ideas ?\n\n-- \nView this message in context: http://www.nabble.com/Very-complex-rebasing---Need-help-tf2239083.html#a6208897\nSent from the git forum at Nabble.com.\n"},{"id":"26582","messageId":"edrs0d$42k$1@sea.gmane.org","threadId":"5516","inReplyTo":"6208897.post@talk.nabble.com","subject":"Re: Very complex rebasing - Need help","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-09-08T13:43:09Z","receivedAt":"2006-09-08T13:43:09Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Jehreg wrote:\n\n> In the Buildroot repo:\n> initial--o--o--ID3--o--o--ID4--o--master\n>                   \\\n>                    --o--o--o--o--o--o--o--o--myproject\n> \n> My problem is that I need to kinda-rebase the ID4 into the myproject\nbranch\n> to make it finally look like this:\n> \n> initial--o--o--ID3--o--o--ID4--o--master\n>                   \\               \\\n>                    --o--o--o--o--o--x--o--o--myproject\n> \n> \n> Any ideas ?\n\nGrafts? Grafting additional parent to commit x.\n\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"}]}