From: Shawn Pearce <spearce@spearce.org>
To: Matt McCutchen <hashproduct@verizon.net>
Cc: git@vger.kernel.org
Subject: Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16?
Date: Tue, 28 Mar 2006 21:23:30 -0500 [thread overview]
Message-ID: <20060329022330.GA15359@spearce.org> (raw)
In-Reply-To: <1143596622.2481.10.camel@mattlaptop.metaesthetics.net>
Matt McCutchen <hashproduct@verizon.net> wrote:
> Dear git people,
>
> I made a customized Linux kernel based on 2.6.15.6 by cloning the stable
> 2.6.15 kernel repository (which was then at version 2.6.15.6) and making
> several commits. Now I would like a Linux kernel based on 2.6.16 with
> the same customizations. This seems to be a very simple task, but I
> have been trying various combinations of git commands for several days
> and have not figured out how to do it.
>
> I believe that means I should pull the 2.6.16 kernel into the "origin"
> branch and then rebase the "master" branch, merging my customizations
> with 2.6.16. To this end, I switched my remote file to point to the
> 2.6.16 stable repository and tried to pull. The result was not what I
> wanted. The situation is complicated by the fact that 2.6.15.6 is not
> an ancestor of 2.6.16. The warning in the man page about branches that
> are modified nonlinearly seems to apply.
>
> How do I make my customized 2.6.16 kernel?
I think you want to use `git-fetch --force` to download origin but
not immediately merge it yet. This will bypass the not-an-ancestor
check you are running into.
Then you can perform the rebase yourself with:
# Export your local changes into a series of patches.
#
git-format-patch -k --stdout --full-index v2.6.16.6 >changes.mbox
# Checkout the new origin (2.6.16) into master.
#
git-reset --hard origin
# Now apply your patches.
#
git-am --binary -3 changes.mbox
If you get merge conflicts fix them up and restart with
`git-am --resolved`.
Note this is the logic of `git-rebase` except it doesn't require
you to actually have a common ancestor, while `git-rebase` does.
--
Shawn.
next prev parent reply other threads:[~2006-03-29 2:23 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 [this message]
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
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=20060329022330.GA15359@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=hashproduct@verizon.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).