{"thread":{"id":"25804","subject":"showing unmerged changes from branch","startedAt":"2010-11-21T23:37:07Z","lastAt":"2010-11-21T23:47:46Z","messageCount":2,"participants":["cmumford","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"156298","messageId":"1290382627024-5761241.post@n2.nabble.com","threadId":"25804","inReplyTo":null,"subject":"showing unmerged changes from branch","fromName":"cmumford","fromEmail":"cmumford@cmumford.com","sentAt":"2010-11-21T23:37:07Z","receivedAt":"2010-11-21T23:37:07Z","isPatch":false,"sender":{"key":"cmumford@cmumford.com","avatar":null},"body":"\nHi:\n\nI'm a Subversion user new to Git. I've created a local branch from a remote\nmaster and want to cherry pick changes to the remote master and merge them\ninto my branch. Periodically I want to do a full merge from the remote\nmaster to my local branch, and then continue to cherry pick changes.\n\nSo to see the available changes I did this:\n\ngit show-branch\n\nAnd once I identified a change that I want I did this:\n\ngit cherry-pick --no-commit <remote master commit sha1>\n\nI then build/test the change, and once happy with I'll commit to my local\nbranch. My question is now that I've cherry picked one change I want to get\na list of all unmerged changes - filtering out ones I've already done?\n\nI'm probably thinking of Git in Subversion terms and not yet thinking the\n\"Git way\". Help is much appreciated.\n\n-Chris\n-- \nView this message in context: http://git.661346.n2.nabble.com/showing-unmerged-changes-from-branch-tp5761241p5761241.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"156299","messageId":"20101121234746.GB24397@burratino","threadId":"25804","inReplyTo":"1290382627024-5761241.post@n2.nabble.com","subject":"Re: showing unmerged changes from branch","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-11-21T23:47:46Z","receivedAt":"2010-11-21T23:47:46Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi Chris,\n\ncmumford wrote:\n\n> And once I identified a change that I want I did this:\n> \n> git cherry-pick --no-commit <remote master commit sha1>\n> \n> I then build/test the change, and once happy with I'll commit to my local\n> branch. My question is now that I've cherry picked one change I want to get\n> a list of all unmerged changes - filtering out ones I've already done?\n\nYou might like \"git cherry\".\n\nHope that helps,\nJonathan\n"}]}