From: Spelic <spelic@shiftmail.org>
To: git@vger.kernel.org
Subject: Forward-port a patch using git
Date: Wed, 01 Dec 2010 16:37:14 +0100 [thread overview]
Message-ID: <4CF66BAA.1010203@shiftmail.org> (raw)
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 have thought that there should be some git mechanism to confirm that
such massive offsets which "patch" sees are actually correct and not
false-positives, and are caused by the commits from 2.6.36 to
2.6.37-rc4. There should be some mechanism in git to track line shifts
in source files caused by commits...
After confirming this, Git should create for me equivalent patch files
that apply cleanly to 2.6.37-rc4 that I can give to other people.
Is it possible? I am unfortunately a newbie with git. Can you help me?
Thank you
PS: I have downloaded the linux-2.6-stable git repository containing all
needed revisions: v2.6.36, v2.6.36.1 and v2.6.37 .
next reply other threads:[~2010-12-01 15:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 15:37 Spelic [this message]
2010-12-01 18:11 ` Forward-port a patch using git Spelic
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=4CF66BAA.1010203@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).