git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: joel reed <joelwreed@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: merging two repositories
Date: Wed, 6 Jun 2007 19:01:09 +0100 (BST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0706061859520.4046@racer.site> (raw)
In-Reply-To: <4666CB31.9070007@gmail.com>

Hi,

On Wed, 6 Jun 2007, joel reed wrote:

> So now I have two trees, one pure git using repo.or.cz, and the other 
> made by git-svn against Google' subversion.

I'd merge them by fetching the pure-git one into the git-svn'ed. Or vice 
versa. Then, you can say "git merge <other-branch>". If the revisions are 
similiar (or identical), it will succeed even if they do not have any 
common ancestor.

Ciao,
Dscho

      reply	other threads:[~2007-06-06 18:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-06 14:56 merging two repositories joel reed
2007-06-06 18:01 ` Johannes Schindelin [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=Pine.LNX.4.64.0706061859520.4046@racer.site \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=joelwreed@gmail.com \
    /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).