From: Jon Smirl <jonsmirl@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: stgit, rebasing with 100 patches
Date: Thu, 1 Oct 2009 19:04:14 -0400 [thread overview]
Message-ID: <9e4733910910011604w68cdca86l2baa2f2fe4db4a32@mail.gmail.com> (raw)
I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I
want to rebase to 2.6.31-rc1. About 30 of these hundred patches got
committed in this interval.
If I rebase directly to 2.6.31-rc1 I end up with a bunch of merge
conflicts as the patches are applied. That's because patches 'a,b,c'
got applied in the merge window. When I push 'a' back down it sees the
combination of 'a,b,c' not just 'a'. It is unable to figure out that
'a' was applied and then 'b' and 'c' applied on top of it.
Is there a better way to locate the patches the got applied?
--
Jon Smirl
jonsmirl@gmail.com
next reply other threads:[~2009-10-01 23:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-01 23:04 Jon Smirl [this message]
2009-10-04 13:00 ` stgit, rebasing with 100 patches Jon Smirl
2009-11-02 8:22 ` Karl Wiberg
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=9e4733910910011604w68cdca86l2baa2f2fe4db4a32@mail.gmail.com \
--to=jonsmirl@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).