{"thread":{"id":"22982","subject":"generate a diff against a specific tag in a remote branch","startedAt":"2010-03-11T09:44:47Z","lastAt":"2010-03-11T10:44:23Z","messageCount":2,"participants":["Pedro Ribeiro","Alex Riesen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"136567","messageId":"74fd948d1003110144l382f7542qed4e80ea0fab6fde@mail.gmail.com","threadId":"22982","inReplyTo":null,"subject":"generate a diff against a specific tag in a remote branch","fromName":"Pedro Ribeiro","fromEmail":"pedrib@gmail.com","sentAt":"2010-03-11T09:44:47Z","receivedAt":"2010-03-11T09:44:47Z","isPatch":false,"sender":{"key":"pedrib@gmail.com","avatar":null},"body":"Hi all,\n\nI currently have a copy of the kernel TuxOnIce git tree, and the\nlatest tag is 2.6.33.\n\nI also have added linus tree as a remote branch\n(git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git).\n\nWhat I want to do is to make a patch of the TuxOnIce changes to apply\nto the linus' 2.6.33. The problem is that the linus tree keeps\nadvacing, obviously, and is now at 2.6.34-rc1.\n\nSo what I've been trying to do is to make a diff against the 2.6.33\ntag of linus' tree. Is this possible?\n\n\nThank you very much,\nPedro\n\nPS: Please CC me directly, I'm not on the list.\n"},{"id":"136570","messageId":"81b0412b1003110244s6f682293l79e0815cb6903aad@mail.gmail.com","threadId":"22982","inReplyTo":"74fd948d1003110144l382f7542qed4e80ea0fab6fde@mail.gmail.com","subject":"Re: generate a diff against a specific tag in a remote branch","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2010-03-11T10:44:23Z","receivedAt":"2010-03-11T10:44:23Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Thu, Mar 11, 2010 at 10:44, Pedro Ribeiro <pedrib@gmail.com> wrote:\n> I currently have a copy of the kernel TuxOnIce git tree, and the\n> latest tag is 2.6.33.\n>\n> I also have added linus tree as a remote branch\n> (git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git).\n>\n> What I want to do is to make a patch of the TuxOnIce changes to apply\n> to the linus' 2.6.33. The problem is that the linus tree keeps\n> advacing, obviously, and is now at 2.6.34-rc1.\n>\n> So what I've been trying to do is to make a diff against the 2.6.33\n> tag of linus' tree. Is this possible?\n\nProbably. Try rebasing your TuxOnIce branch on the tag:\n\n  $ git checkout -b temporary TuxOnIce\n  $ git rebase v2.6.33\n\nIf it works out (you may have to correct some conflicts) during rebase,\nthe branch \"temporary\" can be used to generate a set of patches to\nadd TuxOnIce to a vanill 2.6.33 (by using git format-patch, for example).\n"}]}