From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Knut Franke <Knut.Franke@gmx.de>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: Re: [PATCH] rebase -m: skip cherry-picked commits more reliably
Date: Wed, 24 Nov 2010 07:53:49 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.1.10.1011240746030.17721@debian> (raw)
In-Reply-To: <alpine.DEB.1.10.1011232156510.17721@debian>
On Tue, 23 Nov 2010, Martin von Zweigbergk wrote:
> What I think we really want to do is to remove any patches in
> upstream..branch that also exist in branch..onto. I don't know how to
> do that efficiently, though. (And am I even right about it?)
To try to answer my own question, would the lines prefixed with a plus
in the output of 'git cherry $onto $branch $(git merge-base $upstream
$branch)' work?
/Martin
prev parent reply other threads:[~2010-11-24 12:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-22 23:09 [PATCH] rebase -m: skip cherry-picked commits more reliably Knut Franke
2010-11-23 21:03 ` Martin von Zweigbergk
2010-11-24 6:53 ` Martin von Zweigbergk [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=alpine.DEB.1.10.1011240746030.17721@debian \
--to=martin.von.zweigbergk@gmail.com \
--cc=Knut.Franke@gmx.de \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/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).