tekkub, thanks for the response. both repo's are pushed to github already, and if i somehow lose some history from either, its really not a big deal, although it'd be nice to keep.
so, i kinda see what you mean. i am looking to the subtree merge option. but i'm a little confused about implementation in my particular scenario, as i have one repo for the directory meta, and another for the sub-directory meta/thesis. i tried to follow the instructions from the link, but sadly, they did not work for me :( in particular, i am in ~/meta, which already has a repo with a long commit history. thus, i start with: jovo:Research/oopsi/meta-oopsi% git remote add -f thesis git://github.com/jovo/thesis.git remote thesis already exists. which i take as a good sign. then, i do and get this: jovo:Research/oopsi/meta-oopsi% git merge -s ours --no-commit thesis/ master thesis/master - not something we can merge trying to add or remove a '/' here and there doesn't change anything, neither does including/excluding 'master' thus, i'm stuck. little help? many thanks, jovo On Dec 3, 7:16 pm, Tekkub <[email protected]> wrote: > First and foremost, if the local repos are the only copies you have, I would > back them up or push them to github. Take a step back, clone the repos to a > new path, and work from there with a fresh start. > > What you're looking at here is basically submodules vs subtree merge. Do > you want the repos to maintain separate histories but still be linked > together, essentially making one a plugin of the other... or do you want to > completely merge the repos and their histories together, creating a single > repo from that point on. If you want to keep them separate, then you want > git-submodule. If you want to merge them, you want subtree merge. > > Submodules:http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html > Subtree merge: http://help.github.com/subtree-merge/ > > Tekkub > GitHub Tech Support > http://support.github.com/ > Join us on IRC: #github on freenode.net > Discussion group: [email protected] > > > > On Thu, Dec 3, 2009 at 7:29 PM, JoVo <[email protected]> wrote: > > i have the following folder hierarchy: meta/thesis > > > i had a repo for 'meta', and another for 'meta/thesis'. i continually > > updated the thesis repo, but not the 'meta' repo. just recently, i > > decided to update the meta repo. but, i wanted to include the commit > > history from the thesis repo. so, when in the meta dir, i simply > > called 'git pull thesis' > > > to my surprise, this put copies of all the subfolders within thesis > > into meta, ie, before i had meta/thesis/a and meta/thesis/b, and now i > > also had meta/a and meta/b. so, i deleted the redundant folders, and > > did a commit from the meta folder. when i pushed to github, the > > 'thesis' folder in meta had a funny icon, and listed the commit id > > from the 'thesis' repo. > > > so, i would love to delete the thesis repo, both locally and remotely, > > and still keep the commit history in the 'meta' repo, and have it > > available remotely. if i do a 'rm -rf /thesis/.git', and delete it > > remotely, will i lose the commit history from the 'thesis' repo? > > > many thanks, > > JoVo > > > -- > > > You received this message because you are subscribed to the Google Groups > > "GitHub" group. > > To post to this group, send email to [email protected]. > > To unsubscribe from this group, send email to > > [email protected]<github%[email protected]> > > . > > For more options, visit this group at > >http://groups.google.com/group/github?hl=en. -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
