From: "Christian MICHON" <christian.michon@gmail.com>
To: "Miklos Vajna" <vmiklos@frugalware.org>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: how do I merge completely unrelated repositories ?
Date: Thu, 26 Jun 2008 12:51:58 +0200 [thread overview]
Message-ID: <46d6db660806260351w6082b5f9q6db3ef62552fafc4@mail.gmail.com> (raw)
In-Reply-To: <20080626094522.GA29404@genesis.frugalware.org>
On Thu, Jun 26, 2008 at 11:45 AM, Miklos Vajna <vmiklos@frugalware.org> wrote:
> On Thu, Jun 26, 2008 at 11:39:37AM +0200, Christian MICHON <christian.michon@gmail.com> wrote:
>> How would you do it, since merge will not merge if it cannot find a
>> common ancestor ?
>
> Did you try so?
yes I did. it was failing.
>
> If there are no conflicting paths then a simple
>
> git pull /path/to/other/repo.git master
pull = fetch + merge
maybe I was not fetching the objects properly.
>
> or similar should work.
>
your hint works fine. thanks!
I was starting considering rebasing the 2 repos on a common empty
commit (that would have been desperate)...
--
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !
next prev parent reply other threads:[~2008-06-26 10:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-26 9:39 how do I merge completely unrelated repositories ? Christian MICHON
2008-06-26 9:45 ` Miklos Vajna
2008-06-26 10:51 ` Christian MICHON [this message]
2008-06-26 11:25 ` Johannes Schindelin
2008-06-26 12:19 ` Miklos Vajna
2008-06-26 16:19 ` Oliver Kullmann
2008-06-26 18:26 ` Asheesh Laroia
2008-06-26 18:42 ` Kelly F. Hickel
2008-06-26 11:04 ` Jakub Narebski
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=46d6db660806260351w6082b5f9q6db3ef62552fafc4@mail.gmail.com \
--to=christian.michon@gmail.com \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.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).