From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
To: Matthias Lehmann <mat@matlehmann.de>
Cc: git@vger.kernel.org
Subject: Re: patches between different repositories
Date: Mon, 3 May 2010 19:04:13 +0100 [thread overview]
Message-ID: <q2x86ecb3c71005031104xff08ab8am9a14bb49ebcd154f@mail.gmail.com> (raw)
In-Reply-To: <hrn27j$e3b$1@dough.gmane.org>
On 3 May 2010 18:47, Matthias Lehmann <mat@matlehmann.de> wrote:
> Am I doing something wrong here? Or is there another way to merge changes
> within different repositories with differnt layouts?
>
> Any help would be greatly appreciated.
Try sub-tree merge after the initial setup you will get another
repository as a subdirectory after that you can commit moving files
around to match different layout. After that you can just pull & merge
and everything will just work =)
Read $ git help merge
prev parent reply other threads:[~2010-05-03 18:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 17:47 patches between different repositories Matthias Lehmann
2010-05-03 18:04 ` Dmitrijs Ledkovs [this message]
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=q2x86ecb3c71005031104xff08ab8am9a14bb49ebcd154f@mail.gmail.com \
--to=dmitrij.ledkov@ubuntu.com \
--cc=git@vger.kernel.org \
--cc=mat@matlehmann.de \
/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).