git-subtree

I added a git repository using git-subtree. The problem is that I did a hard reset back to before the repository was added with git-subtree. Now the commit history is still in the repository but it's disconnected from master. Any idea how to remove it? I tried git rm --cached with no luck. LopSae To remove right away commits that are already unreachable, which would be the case of your subtree commits, you can use the following commands: git reflog expire --all --expire-unreachable=0 git repack -A -d git prune git gc will not immediately collect unreachable commits, since these (in the default

I'm quite new to Git: I come from SVN and there I found really powerfull the :external feature. Here in Git I haven't find something similar: submodules are perfect for adding project modules that are not always required. They must be initialized after the repo cloning and you can't include only a subdir of the original project. subtrees are really good for adding libraries (they also allow subdir inclusion), but pushing them is a real pain. So the scenario is this: I have a project, in which I want to include some libraries. I want the possibility to change all these libraries and pushing

I have to deploy a git subdirectory from a non master branch. I have looked at this answer and to the docs on Heroku , but when I issue git subtree push --prefix visualizations heroku develop:master I get the following error error: src refspec d02911f4e410256fae0760f87f186289436ff98b:refs/heads/develop does not match any And I really don't know how to proceed. The git subtree push command does not use the localBranch:remoteBranch syntax used in the plain git push to define what local branch gets pushed into what remote branch. What you might need is just to change that last parameter: git

I'm testing the use of git-subtree to merge a library repo into a bigger project. It seems great in principle. Sometimes when I do a "git subtree pull" I get merge conflicts like this: <<<<<<< HEAD ======= An inserted line from the lib repo >>>>>>> 4d348903449ebb584ab224cb34c6038fbf6b352d That's for a change that was made in the library repo, merging into a file that has not been modified locally. Or another example, where I added a line in the local project repo, but in a file that is part of the subtree being merged: <<<<<<< HEAD Another inserted line ======= >>>>>>>