# showing unmerged changes from branch 2 messages from 2010-11-21 to 2010-11-21. Participants: cmumford, Jonathan Nieder. Thread: https://gitlist.dev/t/25804 ## cmumford, 2010-11-21 23:37 Subject: showing unmerged changes from branch Message-ID: <1290382627024-5761241.post@n2.nabble.com> URL: https://gitlist.dev/e/1290382627024-5761241.post%40n2.nabble.com ``` Hi: I'm a Subversion user new to Git. I've created a local branch from a remote master and want to cherry pick changes to the remote master and merge them into my branch. Periodically I want to do a full merge from the remote master to my local branch, and then continue to cherry pick changes. So to see the available changes I did this: git show-branch And once I identified a change that I want I did this: git cherry-pick --no-commit I then build/test the change, and once happy with I'll commit to my local branch. My question is now that I've cherry picked one change I want to get a list of all unmerged changes - filtering out ones I've already done? I'm probably thinking of Git in Subversion terms and not yet thinking the "Git way". Help is much appreciated. -Chris -- View this message in context: http://git.661346.n2.nabble.com/showing-unmerged-changes-from-branch-tp5761241p5761241.html Sent from the git mailing list archive at Nabble.com. ``` ## Jonathan Nieder, 2010-11-21 23:47 Subject: Re: showing unmerged changes from branch Message-ID: <20101121234746.GB24397@burratino> URL: https://gitlist.dev/e/20101121234746.GB24397%40burratino In-Reply-To: <1290382627024-5761241.post@n2.nabble.com> ``` Hi Chris, cmumford wrote: > And once I identified a change that I want I did this: > > git cherry-pick --no-commit > > I then build/test the change, and once happy with I'll commit to my local > branch. My question is now that I've cherry picked one change I want to get > a list of all unmerged changes - filtering out ones I've already done? You might like "git cherry". Hope that helps, Jonathan ```