git-subtree

I wanted to merge a folder from one repository to another according to the subtree merge method (according to How do you merge two Git repositories? and http://nuclearsquid.com/writings/subtree-merging-and-you/ ) Now I'm confused since the files I added seem to have forgotten their history: git log -p oneMergedFile gives me a diff looking as if the file was newly added, while git log gives me the full history, i.e. containing the history of the merged branch. How can I get the entire history for oneMergedFile ? -p oneMergedFile only shows the changes made to that file. Perhaps it wasn't part

I have a larger git repository (A) that shares a certain amount of code with another project (B) of mine. To make maintenance easier, I decided to have a third repository with the common code (C) which will then be used via git subtree . I prepared everything in A (putting the common code in folder "sub") and used the procedure described in Detach (move) subdirectory into separate Git repository to create C Now that I have C with just a few commits, I wanted to put it back into A, folder sub. I used the approach described in http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge

I try to move a directory and all its history from repository to another repository. Extracting the complete history of the directory is easy with git subtree split . This creates a new branch, which can easily be fetched to the other repository. Now I used git subtree add to paste the directory back into the second repository. If I look at gitk or git log --decorate --graph everything looks fine. All commits are present as expected. Also all the files are present as expected. But when I try to see the history of a transplanted file using git log -- transplanted_dir/somefile , I only see the

I would like to import a SVN repository into a GitHub Enterprise repository There are many questions related to this matter and most of them can be addressed either with Git submodules or Git subtree. In my case I have two repositories: The main project repository The modules repository (a big SVN repository over 2 GB) This module repository has the following architecture: foolib/ moduleA/ ... moduleB/ ... ... For the project, only few modules from foolib are used as svn:externals . For example this main project only uses moduleA from foolib . As mentioned in this question one possible

I have a repository that contains the code for an old version of a website that is no longer being used on master . The site was completely redesigned in a new repository, and the code and history from that repository was copied over into a branch in the repo of the old site, let's call it new_site . I can't merge new_site into master , since the histories are entirely different. I've investigated both submodules and subtree merges a bit, but both seem to only be relevant when you're trying to keep code from one project contained in a subdirectory of another project, not when you want to stick