From: cmumford <cmumford@cmumford.com>
To: git@vger.kernel.org
Subject: showing unmerged changes from branch
Date: Sun, 21 Nov 2010 15:37:07 -0800 (PST) [thread overview]
Message-ID: <1290382627024-5761241.post@n2.nabble.com> (raw)
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.
next reply other threads:[~2010-11-21 23:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-21 23:37 cmumford [this message]
2010-11-21 23:47 ` showing unmerged changes from branch Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290382627024-5761241.post@n2.nabble.com \
--to=cmumford@cmumford.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).