From: Jeff Garzik <jeff@garzik.org>
To: Git Mailing List <git@vger.kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: kernel cherry UN-picking?
Date: Fri, 11 May 2007 17:31:14 -0400 [thread overview]
Message-ID: <4644E0A2.90008@garzik.org> (raw)
So, I merge the next batch of net driver patches. After I merge a PPP
patch, deep in the pile-o-patches, Andrew says "I shouldn't have sent
that to you, don't apply it" ;-)
Right now, my process for reversing this damage is to start over:
create a new branch, manually double-click the mouse on each commit in
the "damaged" branch, and git-cherrypick it. Very, very time consuming
when you have more than a couple commits.
Is there a better way?
Is there any way to say "cherrypick all commits except <these>"?
Jeff
next reply other threads:[~2007-05-11 21:31 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-11 21:31 Jeff Garzik [this message]
2007-05-11 21:55 ` kernel cherry UN-picking? Andrew Morton
2007-05-11 21:56 ` Jeff Garzik
2007-05-15 2:39 ` Josef Sipek
2007-05-11 21:56 ` Junio C Hamano
2007-05-11 22:09 ` Junio C Hamano
2007-05-11 22:11 ` Junio C Hamano
2007-05-12 13:39 ` Jan Harkes
2007-05-12 14:01 ` Jan Harkes
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=4644E0A2.90008@garzik.org \
--to=jeff@garzik.org \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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).