From: Crane Cai <crane.cai@amd.com>
To: git@vger.kernel.org
Subject: [question] retrieve some patches from another repository
Date: Wed, 20 Jan 2010 13:46:14 +0800 [thread overview]
Message-ID: <20100120054614.GA1965@crane-desktop> (raw)
Hi,
Sorry to disturb you. I know this mail list is mainly for git development. Till
now I have not found some normal user mail list, at last I choose it to ask a
question.
My target is:
repository A - linux upstream:
a->b->c->d->[merge from repository B]->e->f
repository B - a maintainer's tree:
x->y->z->[merge from repository A]->...
I want to retrieve the patches for one driver and its related
changes from commit "a" till maintainer's master.
So I do as this:
* git checkout repo B's master
* because maintainer's tree is derived from upstream point "a" will be included,
use git format-patch repo a source-code-name
There are 2 issues in it:
* merge point will cause duplicated patch generated, for example repo B has x,
y, z, then accepted by repo A in merge point, and then merge back to repo B
(they are different with commit id), they will generate 2 twice.
* some commits do not only change the driver source code, and they change some
other files also. Unfortunately git format-patch cut them. It cause compile
error.
My question:
Does some one know git have the ability to do it or do I need to do it
manually?
--
Best Regards,
- Crane
next reply other threads:[~2010-01-20 5:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-20 5:46 Crane Cai [this message]
2010-01-20 6:23 ` [question] retrieve some patches from another repository Junio C Hamano
2010-01-20 8:09 ` Crane Cai
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=20100120054614.GA1965@crane-desktop \
--to=crane.cai@amd.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.