git-subtree

I am using Git subtree with a couple of projects that I am working on, in order to share some base code between them. The base code gets updated often, and the upgrades can happen in anyone of the projects, with all of them getting updated, eventually. I have ran into a problem where git reports that my subtree is up to date, but pushing gets rejected. For example: #! git subtree pull --prefix=public/shared project-shared master From github.com:**** * branch master -> FETCH_HEAD Already up-to-date. If I push, I should get a message that there is nothing to push... Right? RIGHT? :( #! git

I feel that using Git submodules is somehow troublesome for my development workflow. I've heard about Git subtree and Gitslave. Are there more tools out there for multiple repository projects and how do they compare ? Can these tools run on Windows ? Which is best for you depends on your needs, desires, and workflow. They are in some senses semi-isomorphic, it is just some are a lot easier to use than others for specific tasks. gitslave is useful when you control and develop on the subprojects at more of less the same time as the superproject, and furthermore when you typically want to tag,

What are the conceptual differences between using git submodule and subtree? What are the typical scenarios for each? VonC submodule is a better fit for component-based development , where your main project depends on a fixed version of another component (repo). You keep only references in your parent repo ( gitlinks , special entries in the index ) What if I want the links to always point to the HEAD of the external repo? You can make a submodule to follow the HEAD of a branch of a submodule remote repo, with: o git submodule add -b <branch> <repository> [<path>] . (to specify a branch to

I need to merge two Git repositories into a brand new, third repository. I've found many descriptions of how to do this using a subtree merge (for example Jakub Narębski's answer on How do you merge two Git repositories? ) and following those instructions mostly works, except that when I commit the subtree merge all of the files from the old repositories are recorded as new added files. I can see the commit history from the old repositories when I do git log , but if I do git log <file> it shows only one commit for that file - the subtree merge. Judging from the comments on the above answer, I