The key is git submodules. Start reading the Submodules chapter of the Git Community Book or of the Users Manual Say you have repository PROJECT1, PROJECT2, and MEDIA… cd /path/to/PROJECT1 git submodule add ssh://path.to.repo/MEDIA git commit -m “Added Media submodule” Repeat on the other repo… Now, the cool thing is, that any time you commit … Read more
A submodule is its own repo/work-area, with its own .git directory. So, first commit/push your submodule’s changes: $ cd path/to/submodule $ git add <stuff> $ git commit -m “comment” $ git push Then, update your main project to track the updated version of the submodule: $ cd /main/project $ git add path/to/submodule $ git commit … Read more
Assuming the submodule’s repository does contain a commit you want to use (unlike the commit that is referenced from the current state of the super-project), there are two ways to do it. The first requires you to already know the commit from the submodule that you want to use. It works from the “inside, out” … Read more
If you want to do this for all submodules, without having to change directories, you can perform git submodule foreach git reset –hard You can also use the recursive flag to apply to all submodules: git submodule foreach –recursive git reset –hard
submodule is link; subtree is copy
git submodule update –recursive You will also probably want to use the –init option which will make it initialize any uninitialized submodules: git submodule update –init –recursive Note: in some older versions of Git, if you use the –init option, already-initialized submodules may not be updated. In that case, you should also run the command … Read more
Enter the submodule directory: cd projB/projA Pull the repo from you project A (will not update the git status of your parent, project B): git pull origin master Go back to the root directory & check update: cd .. git status If the submodule updated before, it will show something like below: # Not currently … Read more
No submodule mapping found in .gitmodules for path ‘OtherLibrary/MKStore’ when $ git submodule update –init I didn’t know why the error occur. After spending a minute and found the answer in stackoverflow. $ git rm –cached OtherLibrary/MKStore and then update the submodule again. It’s working fine. http://en.saturngod.net/no-submodule-mapping-found-in-gitmodules
You go into ~/.janus and run: git submodule add <git@github …> snipmate-snippets/snippets/ If you need more information about submodules (or git in general) ProGit is pretty useful.
If all you want is to put your submodule code into the main repository, you just need to remove the submodule and re-add the files into the main repo: git rm –cached submodule_path # delete reference to submodule HEAD (no trailing slash) git rm .gitmodules # if you have more than one submodules, # you … Read more