{"thread":{"id":"3372","subject":"Re: What's in git.git","startedAt":"2006-02-17T14:28:36Z","lastAt":"2006-02-18T06:49:48Z","messageCount":2,"participants":["linux@horizon.com","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16322","messageId":"20060217142836.13137.qmail@science.horizon.com","threadId":"3372","inReplyTo":null,"subject":"Re: What's in git.git","fromName":"","fromEmail":"linux@horizon.com","sentAt":"2006-02-17T14:28:36Z","receivedAt":"2006-02-17T14:28:36Z","isPatch":false,"sender":{"key":"linux@horizon.com","avatar":null},"body":" - \"Rebase to different branch\" (1 commit):\n\n   This was previously discussed on the list.  With this command\n   line:\n\n    \t$ git rebase --onto master~1 master topic\n    \n   would rebase this ancestry graph to:\n    \n              A---B---C topic\n             /\n        D---E---F---G master\n    \n    \n   another graph that looks like this:\n    \n                  A'--B'--C' topic\n                 /\n        D---E---F---G master\n\n   Earlier, you couldn't rebase to anywhere other than on top of\n   \"the other branch\".\n\n\nEr... what does this do, again?  I couldn't find the list discussion, and\nI can get this exact effect in vanilla 1.2.1 with \"git rebase master~1 topic\".\nAFAIK, $ARGV[1] of git-rebase only has to be a commit-ish, not a branch.\n\nOTOH, I can imagine wanting\n\t$ git-rebase master~1 topic topic~2\n\nto produce\n\n              A   B---C topic\n             /   /\n        D---E---F---G master\n\nH'm... I wonder if the same syntax could be used to resolve the ambiguous\ncase where there are multiple possible common ancestors, e.g.\n\n              A---B---C topic\n             /   /\n        D---E---F---G master\n\nas discussed in the \"git rebase behaviour changed?\" thread...\n"},{"id":"16358","messageId":"7vzmkpupo3.fsf@assigned-by-dhcp.cox.net","threadId":"3372","inReplyTo":"20060217142836.13137.qmail@science.horizon.com","subject":"Re: What's in git.git","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-18T06:49:48Z","receivedAt":"2006-02-18T06:49:48Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"linux@horizon.com writes:\n\n> Er... what does this do, again?  I couldn't find the list\n> discussion, and I can get this exact effect in vanilla 1.2.1\n> with \"git rebase master~1 topic\".\n>...\n> OTOH, I can imagine wanting\n>...\n>               A   B---C topic\n>              /   /\n>         D---E---F---G master\n\nYup.  The example was a bad one, but the above, and in general\n\n         X---A'--B'--C' topic\n\n         D---E---F---G master\n\non an arbitrary X was what I wanted to do.\n"}]}