* showing unmerged changes from branch
@ 2010-11-21 23:37 cmumford
2010-11-21 23:47 ` Jonathan Nieder
0 siblings, 1 reply; 2+ messages in thread
From: cmumford @ 2010-11-21 23:37 UTC (permalink / raw
To: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: showing unmerged changes from branch
2010-11-21 23:37 showing unmerged changes from branch cmumford
@ 2010-11-21 23:47 ` Jonathan Nieder
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Nieder @ 2010-11-21 23:47 UTC (permalink / raw
To: cmumford; +Cc: git
Hi Chris,
cmumford wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-21 23:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-21 23:37 showing unmerged changes from branch cmumford
2010-11-21 23:47 ` Jonathan Nieder
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).