From: Karl Wiberg <kha@treskal.com>
To: Jon Smirl <jonsmirl@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Catalin Marinas <catalin.marinas@gmail.com>
Subject: Re: stgit, rebasing with 100 patches
Date: Mon, 2 Nov 2009 09:22:13 +0100 [thread overview]
Message-ID: <b8197bcb0911020022k5fefa7f5ia0901af8df0a3604@mail.gmail.com> (raw)
In-Reply-To: <9e4733910910040600g2cbd1deah6e7ae3ad9a4aa54e@mail.gmail.com>
On Sun, Oct 4, 2009 at 2:00 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
> On Thu, Oct 1, 2009 at 7:04 PM, Jon Smirl <jonsmirl@gmail.com> wrote:
>
> > Is there a better way to locate the patches the got applied?
>
> A solution to this is to make an option on rebase that walks the
> patch stack forward one commit at a time.
>
> What does the --merged option do on stg rebase? The doc is rather
> sparse.
Right, -m/--merged is what you want. Before applying any of the
patches, it tries to reverse-apply all of them in reverse
order---successful applications mean the patch was already in
upstream. It works surprisingly well.
--
Karl Wiberg, kha@treskal.com
www.treskal.com/kalle
prev parent reply other threads:[~2009-11-02 8:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-01 23:04 stgit, rebasing with 100 patches Jon Smirl
2009-10-04 13:00 ` Jon Smirl
2009-11-02 8:22 ` Karl Wiberg [this message]
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=b8197bcb0911020022k5fefa7f5ia0901af8df0a3604@mail.gmail.com \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonsmirl@gmail.com \
/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).