git-subtree

问题 I have multiple projects that shares child apps with other projects . When working within the project directory I want to be able to make changes to the app , update it, and pull those updates into the second project . Requirement: No use of symbolic links (my IDE's debugger doesn't work well with them) No compiling/rerun a script. I would like to make changes to the app without having to rerun a script/buildout. Apps must be within the project folder. Here's the structure: app_one (git repo)

问题 Now that git subtree has been merged into the core git distribution (its also on Msysgit as of 1.8.0), does anyone know if git svn works with git subtree? Note: I am not talking about the subtree merge strategy, but about this. Git submodules cannot be used directly when you are using git svn. Instead, it requires another level of indirection. In addition, the git subtree workflow is more convenient when you're tracking third party respositories, which is something that happens when you use

问题 I've been using the git-subtree extension (https://github.com/apenwarr/git-subtree) to manage sub-projects within our main project. It's doing exactly what I want other than the fact that it fails when I try to split out changes made to a sub-project from our main project. e.g. earlier on I had done git subtree add -P Some/Sub/Dir --squash git@gitserver:lib.git master to bring in the library code to Some/Sub/Dir in our main project. Everything here went great so I then pushed my changes 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

问题 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

问题 In some of the repositories that I'm working with, I found git subtree does not behave as expected when sharing repos. Here's the scenario: I own main repo X and push it to origin. My colleague pulls repo X from origin, adds a subtree pointing to another repo Y, makes the commit, and pushes X back to origin. I pull X and see the changes my colleague has made. However, in my local repo, the folder containing subtree Y is just another file. I can't pull changes from repo Y even after adding

问题 Probably, i misunderstood how git works, I have my directory structure as follows: project (git-repo) project 1 (git-repo) project 2 (git-repo) common scripts (git-repo) All these folders have their own repositories where the main project can have child repositories such as project 1 , project 2 , child scripts . They can be submodules or subtree. The problem, the common scripts contain some of the codes that is common and essential to build both project 1 and project 2 . What can be best

问题 I would like to be able to update subtrees automatically. I have one repo that consists solely of subtrees from third-party repos, and would like to use a post hook to update these whenever the main repo is pulled. 回答1: Just as a concern, in development of larger projects it's often important for dependent libraries to remain stable. If you constantly pull the changes automatically you don't have the opportunity to confirm that they don't come with breaking changes for your parent project. If

问题 Suppose I have a git repo containing a file text.txt inside a directory dir_a . Later on, I decide to move text.txt to a new directory called dir_b . After a while, I decide I should split dir_b into its own standalone git repository using git subtree split . By default, the earliest commit in dir_b 's repository is the commit where I moved text.txt from dir_a to dir_b , which is unfortunate, because e.g. a blame won't work as intended. Is there a way to preserve, in the new git repo, the

问题 We are using TFS as main source control and I would like to use git as a "frontend" together with git-tfs rcheckin command but I have problems importing my repositories into git. I have a two projects in my TFS $/ProjectA $/ProjectB and I would like to manage them in one git repository. How I can clone those two into one git repository so I can commit and push changes to both projects as one TFS changeset? I tried using git tfs subtree but somehow I cannot figure out workflow with this. My