showing unmerged changes from branch

cmumford· Nov 21, 2010, 23:37 UTC · lore

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 <remote master commit sha1>

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· Nov 21, 2010, 23:47 UTC · re: cmumford · lore

Re: showing unmerged changes from branch

Hi Chris,

cmumford wrote:

Show 7 quoted lines

> And once I identified a change that I want I did this:
> 
> git cherry-pick --no-commit <remote master commit sha1>
> 
> 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