From: Matt McCutchen <hashproduct@verizon.net>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16?
Date: Wed, 29 Mar 2006 22:47:55 -0500 [thread overview]
Message-ID: <1143690475.2524.7.camel@mattlaptop.metaesthetics.net> (raw)
In-Reply-To: <7vy7ys4nwk.fsf@assigned-by-dhcp.cox.net>
On Wed, 2006-03-29 at 19:22 -0800, Junio C Hamano wrote:
> It should have been
>
> $ git format-patch --stdout origin master | git am -3
Thanks! My kernel is finally merged and is building as I write! It
turns out that parts of my commits #2-#4 had already been addressed
between 2.6.15.6 and 2.6.16. I had to merge #2 with what had already
been done, and #3 and #4 became unnecessary.
--
Matt McCutchen
hashproduct@verizon.net
http://hashproduct.metaesthetics.net/
next prev parent reply other threads:[~2006-03-30 3:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-29 1:43 How to switch kernel customizations from 2.6.15.6 to 2.6.16? Matt McCutchen
2006-03-29 2:10 ` Linus Torvalds
2006-03-29 2:30 ` Junio C Hamano
2006-03-29 3:58 ` Junio C Hamano
2006-03-29 19:27 ` Linus Torvalds
2006-03-29 19:39 ` Linus Torvalds
2006-03-29 20:24 ` Junio C Hamano
2006-03-30 1:59 ` Rebase semantic and cherry-pick Jakub Narebski
2006-03-30 2:38 ` Junio C Hamano
2006-03-30 2:54 ` Linus Torvalds
2006-03-30 3:40 ` Junio C Hamano
2006-03-30 3:15 ` How to switch kernel customizations from 2.6.15.6 to 2.6.16? Junio C Hamano
2006-03-29 2:23 ` Shawn Pearce
2006-03-29 2:26 ` Junio C Hamano
2006-03-30 3:01 ` Matt McCutchen
2006-03-30 3:22 ` Junio C Hamano
2006-03-30 3:47 ` Matt McCutchen [this message]
2006-03-30 17:32 ` Linus Torvalds
2006-03-30 21:50 ` Matt McCutchen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1143690475.2524.7.camel@mattlaptop.metaesthetics.net \
--to=hashproduct@verizon.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).