git-subtree

So, I've a bigger (closed source) project, and in the context of this project created a library which could also be useful elsewhere, I think. I now want to split off the library in its own project, which could go as open source on github or similar. Of course, the library (and its history there) should contain no traces of our project. git-subtree seems like a solution here, but it does not completely fit. My directory layout is something like this (since it is a Java project): fencing-game (git workdir) src de fencing_game transport (my library) protocol (part of the library) fencing (part

I use Git Subtree like below: git subtree add --prefix=directory_destination_path --squash git@bitbucket.org:kicaj/projectname.git master But in path: directory_destination_path copy all repo from projectname.git How to copy to directory_destination_path only subdirectory or only some file from projectname.git ? EDIT: One more question: How to update (automatic) files changes in both repositories were still the same? It is possible? eddiemoya If I understand, you seem to want to only merge in a certain directory of a different repository, and you want it to be a subtree in your repository. I

Is there a way to add a subdirectory of a remote repository into a subdirectory of my repository with git-subtree? Suppose I have this main repository: / dir1 dir2 And this library repository: / libdir some-file some-file-to-be-ignored I want to import library /libdir into main /dir1 so that it looks like this: / dir1 some-file dir2 Using git-subtree, I can specify to import into dir1 with the --prefix argument, but can I also specify to only take the contents of a specific directory in the subtree? The reason for using git-subtree is that I can later synchronize the two repositories. John

I merged a tree onto a my repository by using git subtree add without the squash option. A git log shows that the commits were successfully added to the repository. However, if I do a git log --follow filename , the history stops at the merge and does not show previous commits. I tried using -M instead of --follow and that doesn't work either. How can I get a log of the commits for a specific file or files from before the merge? Actually, git log --follow should work with subtree merges, but it is known to be hackish for a long time [1-3]. One can stick with subtree merges and rest asured that

We have been trying to get git-subtree working on a project (with git version 1.7.9.4) and have run into a bit of a complication. Someone else previous added the subtree with this command some months ago: git subtree add --prefix=foo git@example.com:foo.git master Now there have been substantive changes to foo and we'd like to merge in those changes, ideally squashing them in. None of the files have been modified since they were imported. I've tried three things to try and merge in the changes. First: git subtree pull --squash -P foo git@example.com:foo.git master Which throws the exception:

I have a large code base under source control (was subversion, now git). To compile the code and run the tests I use a set of 3rd party libraries. These libraries can be divided into few categoriesL Binaries only 3rd party sources 3rd party sources + local modifications Each library has its {Windows, Linux} X {debug, release} X {32bit, 64bit} configurations. In addition these libraries evolve with time and different versions of my project use different versions/builds of these libraries. My question is what is the best way to store these 3rd parties? Here is my set of preferences: Keep the