From: Spelic <spelic@shiftmail.org>
To: git@vger.kernel.org
Subject: Re: Forward-port a patch using git
Date: Wed, 01 Dec 2010 19:11:23 +0100 [thread overview]
Message-ID: <4CF68FCB.2030301@shiftmail.org> (raw)
In-Reply-To: <4CF66BAA.1010203@shiftmail.org>
On 12/01/2010 04:37 PM, Spelic wrote:
> Hi all
> I have patches (xyz.patch files) which apply cleanly to kernel 2.6.36
> and 2.6.36.1 and do not apply cleanly on 2.6.37-rc4 (I mean they do
> apply but with massive offsets...)
> I would like to forward-port them to 2.6.37-rc4, i.e. create
> equivalent patch files that would apply cleanly on 2.6.37-rc4 with
> zero offsets.
>
I found it myself, sorry for having asked.
It was:
checkout v2.6.36
apply 1 patch
commit
apply 1 patch
commit
...
rebase v2.6.37-rc4
git format-patch -o <destdir> -numpatches
next prev parent reply other threads:[~2010-12-01 18:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 15:37 Forward-port a patch using git Spelic
2010-12-01 18:11 ` Spelic [this message]
2010-12-01 18:16 ` Jeff King
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=4CF68FCB.2030301@shiftmail.org \
--to=spelic@shiftmail.org \
--cc=git@vger.kernel.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).