{"thread":{"id":"18085","subject":"Applying the changes of a specific commit from one branch to another.","startedAt":"2009-03-02T01:44:04Z","lastAt":"2009-03-02T02:52:28Z","messageCount":3,"participants":["NewToGit","Chris Packham"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"106662","messageId":"22280717.post@talk.nabble.com","threadId":"18085","inReplyTo":null,"subject":"Applying the changes of a specific commit from one branch to another.","fromName":"NewToGit","fromEmail":"omarnetbox@gmail.com","sentAt":"2009-03-02T01:44:04Z","receivedAt":"2009-03-02T01:44:04Z","isPatch":false,"sender":{"key":"omarnetbox@gmail.com","avatar":null},"body":"\nApplying the changes of a specific commit from one branch to another.\n\nScenario:\n\n- branched off master and created story123 branch.\n- made three separate change commits to story123:\n\t- 'fixed bug123'\n\t- 'fixed bug456'\n\t- 'fixed bug789'\n\n- now I realized that I need to apply only one commit 'fixed bug789' to\nmaster\n\nQuestion: What's the best way to go about doing this?\n\nThanks for the help!\n\nNewToGit\n\n-- \nView this message in context: http://www.nabble.com/Applying-the-changes-of-a-specific-commit-from-one-branch-to-another.-tp22280717p22280717.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"106663","messageId":"a038bef50903011758v11706f27v897df8b6d0d9ca7c@mail.gmail.com","threadId":"18085","inReplyTo":"22280717.post@talk.nabble.com","subject":"Re: Applying the changes of a specific commit from one branch to another.","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2009-03-02T01:58:18Z","receivedAt":"2009-03-02T01:58:18Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On Mon, Mar 2, 2009 at 2:44 PM, NewToGit <omarnetbox@gmail.com> wrote:\n> Scenario:\n>\n> - branched off master and created story123 branch.\n> - made three separate change commits to story123:\n>        - 'fixed bug123'\n>        - 'fixed bug456'\n>        - 'fixed bug789'\n>\n> - now I realized that I need to apply only one commit 'fixed bug789' to\n> master\n>\n> Question: What's the best way to go about doing this?\n>\n\nWhat you want to do is \"cherry-pick\" the commit 'fixed bug789'. With\ngit there are several ways to do this but the one I'd use is the\ncherry-pick functionality of gitk.\n\ngit checkout master\ngitk --all\n<right click on the 'fixed bug789' commit and select \"cherry-pick this commit\">\n\nLike I say there are plenty of ways to do something like this. I'm\nsure you'll get plenty more responses.\n"},{"id":"106664","messageId":"a038bef50903011852m1394d444tac5462d3a03906bb@mail.gmail.com","threadId":"18085","inReplyTo":"22d8f6460903011824t18c01d83p16c05af9f9a12ee5@mail.gmail.com","subject":"Re: Applying the changes of a specific commit from one branch to another.","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2009-03-02T02:52:28Z","receivedAt":"2009-03-02T02:52:28Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"On Mon, Mar 2, 2009 at 3:24 PM, omar-uk <omarnetbox@googlemail.com> wrote:\n> Many Thanks Chris! for the quick response.\n>\n> What I do right click on? I tried the commit message but not getting\n> any menus or anything. BTW I'm using a mac not sure if it makes a\n> difference.\n\nHmm, Doesn't mac imply only one mouse button? Anyway whatever the\nequivalent to right click is you click on the headline (also referred\nto as the subject) in the tree (top half of the gitk window).\n\nAlso for mac a lot of people are using GitX which has similar\nfunctionality to gitk (I can't claim any knowledge about it).\n"}]}