From: Jonathan Nieder <jrnieder@gmail.com>
To: Lane Brooks <lane@brooks.nu>
Cc: Git List <git@vger.kernel.org>, Yann Dirson <ydirson@altern.org>
Subject: Re: How to manage merges from one line while excluding its merges from another
Date: Fri, 25 Jun 2010 19:51:52 -0500 [thread overview]
Message-ID: <20100626005151.GA12401@burratino> (raw)
In-Reply-To: <4C254B62.6020108@brooks.nu>
Lane Brooks wrote:
> I'll take a look at your suggested cherry-pick script. Can it be
> rerun multiple times or is it run one-time only. In others, as
> 'devel' continues to grow can I run it again and will it cherry-pick
> intelligently or will it try to reapply commits already
> cherry-picked?
Good point.
git cherry my devel main |
grep -v ^- |
while read mark rev
do
git cherry-pick $rev ||
{
echo >&2 cherry-pick failed
break
}
done
I hadn’t known about the third argument to ‘git cherry’ before.
Thanks for the example.
prev parent reply other threads:[~2010-06-26 0:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-25 22:26 How to manage merges from one line while excluding its merges from another Lane Brooks
2010-06-26 0:03 ` Jonathan Nieder
2010-06-26 0:35 ` Lane Brooks
2010-06-26 0:51 ` Jonathan Nieder [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=20100626005151.GA12401@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=lane@brooks.nu \
--cc=ydirson@altern.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).