{"thread":{"id":"43653","subject":"Re: Rebasing part of a branch","startedAt":"2006-11-02T10:45:23Z","lastAt":"2006-11-02T11:15:38Z","messageCount":2,"participants":["Jakub Narebski","Andy Parkins"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"298645","messageId":"200611021045.25423.andyparkins@gmail.com","threadId":"43653","inReplyTo":null,"subject":"Rebasing part of a branch","fromName":"Andy Parkins","fromEmail":"andyparkins@gmail.com","sentAt":"2006-11-02T10:45:23Z","receivedAt":"2006-11-02T10:45:23Z","isPatch":false,"sender":{"key":"andyparkins@gmail.com","avatar":null},"body":"Hello,\n\nIs there a way to rebase part of a branch?  For example\n\n                        H---I---J topicB\n                       /\n              E---F---G  topicA\n             /\nA---B---C---D  master\n\nAnd I want:\n\n             H---I---J  topicB\n            /\n            | E---F---G  topicA\n            |/\nA---B---C---D  master\n\nOf course,\n \n git-checkout topicB\n git-rebase master\n\nDoesn't work, because the common ancestor is D, which is master, and there is \nnothing to do.\n\nOf course I can cherry-pick, but is there something like\n\n git-rebase --limit topicA master\n\nOr some git-magic I can work?\n\n\nAndy\n-- \nDr Andy Parkins, M Eng (hons), MIEE\n"},{"id":"296329","messageId":"eick03$mh3$1@sea.gmane.org","threadId":"43653","inReplyTo":"200611021045.25423.andyparkins@gmail.com","subject":"Re: Rebasing part of a branch","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-11-02T11:15:38Z","receivedAt":"2006-11-02T11:15:38Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Andy Parkins wrote:\n\n> Hello,\n> \n> Is there a way to rebase part of a branch?  For example\n> \n>                         H---I---J topicB\n>                        /\n>               E---F---G  topicA\n>              /\n> A---B---C---D  master\n> \n> And I want:\n> \n>              H---I---J  topicB\n>             /\n>             | E---F---G  topicA\n>             |/\n> A---B---C---D  master\n\nWe have\n git-rebase [--merge] [--onto <newbase>] <upstream> [<branch>]\n\nTry then\n$ git rebase --onto master topicA topicB\n\n(if you checked out topicB, you don't need last topicB in git-rebase).\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"}]}