{"thread":{"id":"28795","subject":"Fork freedesktop project to bitbucket, make changes, generate patch back to freedesktop?","startedAt":"2011-10-29T03:35:42Z","lastAt":"2011-11-02T23:37:14Z","messageCount":2,"participants":["Alec Taylor","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"178504","messageId":"CAO+9iGeHSsJz+7=N0BzmGGbkGN1P=CyNvxJWO_1nCNjiZZzetA@mail.gmail.com","threadId":"28795","inReplyTo":null,"subject":"Fork freedesktop project to bitbucket, make changes, generate patch back to freedesktop?","fromName":"Alec Taylor","fromEmail":"alec.taylor6@gmail.com","sentAt":"2011-10-29T03:35:42Z","receivedAt":"2011-10-29T03:35:42Z","isPatch":false,"sender":{"key":"alec.taylor6@gmail.com","avatar":null},"body":"Good afternoon,\n\nI've forked a [git] freedesktop project to [git] bitbucket.\n\nI am working with a team extending the functionality of this project.\n\nAfter many MANY adds, commits and pushes back and forth on the\nbitbucket project, we then want to send this freedesktop project a\nPATCH with the changes we've made.\n\nCan you tell me the command I need to do this?\n\nThanks for all suggestions,\n\nAlec Taylor\n"},{"id":"178737","messageId":"20111102233714.GB17466@sigill.intra.peff.net","threadId":"28795","inReplyTo":"CAO+9iGeHSsJz+7=N0BzmGGbkGN1P=CyNvxJWO_1nCNjiZZzetA@mail.gmail.com","subject":"Re: Fork freedesktop project to bitbucket, make changes, generate patch back to freedesktop?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2011-11-02T23:37:14Z","receivedAt":"2011-11-02T23:37:14Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Oct 29, 2011 at 02:35:42PM +1100, Alec Taylor wrote:\n\n> I am working with a team extending the functionality of this project.\n> \n> After many MANY adds, commits and pushes back and forth on the\n> bitbucket project, we then want to send this freedesktop project a\n> PATCH with the changes we've made.\n> \n> Can you tell me the command I need to do this?\n\nDo you want to send them one patch, or a series of patches?\n\nIf one, then you probably want to diff off of some known point (either\ntheir current branch tip, or maybe some recently released version). And\nthen send them the resulting diff in an email. You can just use \"git\ndiff\" for this if you want, and include it in an email, or you can\nactually create a new \"squashed\" commit in git, like this:\n\n  git checkout v1.0 ;# or wherever you think they would want to apply\n  git merge --squash your-branch\n  git commit\n\nand then use \"git format-patch\" to create a patch (and optionally\ngit-send-email to send it).\n\nIf you want to share the whole series, you can use format-patch to\ncreate the series, but note that a patch series can only represent a\nlinear history. If you have a lot of merges from pushing back and forth,\nyou may want to linearize it first using \"git rebase -i\".\n\nThat's just a high level overview of what you'll need. You can try\nreading up on those commands to get a better sense of exactly how you\nwant to proceed, or if you have more specific questions, ask.\n\n-Peff\n"}]}