<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">Sounds to me like you want to do a
merge.<br>
<br>
I think the only way to do it successfully in your case, is that
you'd have to make some changes to your local repo first.<br>
<br>
For example, lets say you have two repos. Repo-A (yours), and
Repo-B (the remote repo that you would like your Repo-A to reside
in as a sub-directory).<br>
<br>
If your Repo-A has the following layout (for example):<br>
<br>
Repo-A:<br>
<font color="#006600">dir1/<br>
dir2/<br>
dir3/<br>
file1<br>
file2<br>
</font><br>
<br>
And the remote repo (Repo-B) has the following layout (for
example):<br>
<br>
Repo-B:<br>
<font color="#006600">dir4/<br>
dir5/<br>
file3<br>
file4</font><br>
<br>
<br>
You would have to alter your local repository to modify it's
layout, tossing everything into a sub-directory:<br>
<br>
Repo-A becomes:<br>
<br>
<font color="#006600">antonios-stuff/dir1/<br>
antonios-stuff/dir2/<br>
antonios-stuff/dir3/<br>
antonios-stuff/file1<br>
antonios-stuff/file2</font><br>
<br>
<br>
After you commit these changes to your to your local repository
(Repo-A), you should be able to do a merge to Repo-B without
causing any conflicts.<br>
<br>
The end result would be of course:<br>
<br>
<br>
Repo-B:<br>
<font color="#006600">dir4/<br>
dir5/<br>
file3<br>
file4<br>
antonios-stuff/dir1/<br>
antonios-stuff/dir2/<br>
antonios-stuff/dir3/<br>
antonios-stuff/file1<br>
antonios-stuff/file2</font><br>
<br>
As Carlo just mentioned (as I was typing this up), git-subtree may
provide this functionality (haven't used it myself).<br>
<br>
Not sure if this was quite what you were looking for, but the
above seems to me like it would work for your needs (without my
knowing too much detail).<br>
<br>
Hope it all works out for you.<br>
<br>
Cheers,<br>
-Bobby<br>
<br>
On 13-01-17 12:12 PM, Antonio Sun wrote:<br>
</div>
<blockquote
cite="mid:CAKczvCbsA1ucezz_xDz18QT+FYybg+rTXC39zB6BL=OCkqN02Q@mail.gmail.com"
type="cite">
<div dir="ltr"><br>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">On Thu, Jan 17, 2013 at 11:22 AM,
Olaf Alders <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:olaf.alders@gmail.com" target="_blank">olaf.alders@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class="">
<div class="h5"><br>
> An off-topic question on Git -- how to put my
locally managed Git repo under a sub-folder of another
remote Git repo?<br>
><br>
> My locally managed Git repo was created totally
locally, without any remote repo. Now I hope
everything, including the histories, can show up under
a sub-folder of another remote Git repo.<br>
<br>
<br>
</div>
</div>
Hi Antonio,<br>
<br>
I think you want "git submodule".<br>
<br>
<a moz-do-not-send="true"
href="http://git-scm.com/book/en/Git-Tools-Submodules"
target="_blank">http://git-scm.com/book/en/Git-Tools-Submodules</a><br>
</blockquote>
<div><br>
</div>
<div style="">Thanks Olaf, </div>
<div style=""><br>
</div>
<div style="">That's not quite what I was looking for. For
git submodule, "<span
style="background-color:rgb(252,252,250);color:rgb(78,68,60);font-family:Georgia,'Times
New Roman',serif;font-size:14px;line-height:22px">you
want to be able to treat the two projects as <b>separate
</b>yet still be able to use one from within the other.
. . </span><span
style="background-color:rgb(252,252,250);color:rgb(78,68,60);font-family:Georgia,'Times
New Roman',serif;font-size:14px;line-height:22px">Submodules
allow you to keep a Git repository as a subdirectory of
another Git repository. This lets you clone another
repository into your project and keep your commits
separate.</span>" </div>
<div style=""><br>
</div>
I wasn't able to find a remote repo for my local repo until
recently, now I just want to give my local repo a remote
repo, but should be under a sub folder. Afterward, there
would be only one <b>combined </b>repo. Would that be
possible? </div>
<div class="gmail_quote"><br>
</div>
<div class="gmail_quote" style="">Thanks</div>
<div class="gmail_quote" style=""><br>
</div>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
toronto-pm mailing list
<a class="moz-txt-link-abbreviated" href="mailto:toronto-pm@pm.org">toronto-pm@pm.org</a>
<a class="moz-txt-link-freetext" href="http://mail.pm.org/mailman/listinfo/toronto-pm">http://mail.pm.org/mailman/listinfo/toronto-pm</a>
</pre>
</blockquote>
<br>
</body>
</html>