git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jamil Djadala <djadala@datamax.bg>
To: git@vger.kernel.org
Subject: how to union 2 repos
Date: Mon, 26 May 2008 13:08:24 +0300	[thread overview]
Message-ID: <1211796504.20622.26.camel@bee.datamax.bg> (raw)

Hi all

quote from core-tutorial:
######### begin quote
Note
You could do without using any branches at all, by keeping as many local
repositories as you would like to have branches, and merging between
them with git pull, just like you merge between branches. The advantage
of this approach is that it lets you keep a set of files for each branch
checked out and you may find it easier to switch back and forth if you
juggle multiple lines of development simultaneously. Of course, you will
pay the price of more disk usage to hold multiple working trees, but
disk space is cheap these days.
########## end quote


I still can't realize how to  union 2 git repositories with linear
history, into 1 repo with 2 branches.
i try git-rebase, but results are unexpected.

i have 2 repos with history, assuming initial commit in both repos are
same:

1:
a-b-c-d-e-f
2:
a-B-C-D-E-F


i want repository with this history:

a-b-c-d-e-f
 \B-C-D-E-F


i try following:
1. copy objects from other repo :
git-fetch ../other/.git +master:otherMaster
history after this command is 2 unconnected chains:
a-b-c-d-e-f  a-B-C-D-E-F
2.Then i try following:
git-rebase --onto a f F

but results are strange
(git, complain about merge errors, history is like:

x-x-x-x-x-x-----------x
 \x-x-x    \x-x-x-x-x

)

can someone help me how to do this ?



Thanks in advance

-- 
Jamil Djadala <djadala@datamax.bg>
Datamax

             reply	other threads:[~2008-05-26 10:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-26 10:08 Jamil Djadala [this message]
2008-05-26 11:10 ` how to union 2 repos Johannes Sixt

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=1211796504.20622.26.camel@bee.datamax.bg \
    --to=djadala@datamax.bg \
    --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).