From: Jay Soffian <jaysoffian@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: cherry-pick/rebase question
Date: Wed, 21 Jan 2009 12:27:34 -0500 [thread overview]
Message-ID: <76718490901210927m7fd3fbdey6ebd4cbfe44b1b71@mail.gmail.com> (raw)
Say I have the following linear set of commits on master:
A---B---C---D---E---F---G master
And I realize that I've intermixed two topics such that I want to move
commits B and E-G to their own branch. So my result should be:
A---C'---D' master
\
B'---E'---F'---G' topic
What's the best way to do it?
I read the rebase and cherry-pick man pages, found myself confused,
tried rebase a few different ways, failed, and ended up doing what I
needed with format-patch and am. (Extract B-G with format-patch, reset
master to A, create topic branch, apply B,E,F,G to topic with am,
similarly apply C,D to master with am.)
Thanks,
j.
next reply other threads:[~2009-01-21 17:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 17:27 Jay Soffian [this message]
2009-01-21 17:46 ` cherry-pick/rebase question Jay Soffian
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=76718490901210927m7fd3fbdey6ebd4cbfe44b1b71@mail.gmail.com \
--to=jaysoffian@gmail.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.
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 NNTP newsgroup(s).