Geek Answers Handbook

Using git subtree merge from multiple sites

My project uses a number of third-party libraries. I use the subtree merge procedure described in http://progit.org/book/ch6-7.html . I would like to allow other developers to maintain libraries and periodically merge updates from the library repository by doing the following:

$ git checkout rack_branch
$ git pull

Is there a way to publish the rack_remote and rack_branch file so that they are part of the central repository so that other developers can use them?

+5
source share
2 answers

You should probably document the prefix, URL, and branch for each upstream subtree in some part of the project documentation.

, , , / .

:

git merge --no-commit sub/master
git read-tree -u --prefix=sub sub/master
git commit

:

Merge remote-tracking branch 'sub/master'

, sub, master, URL. URL- , .

git pull "" :

git pull -Xsubtree=sub sub master

URL- :

Merge branch 'master' of server:path/to/repository

, , (, 15dbbda sub/master), ; URL-, - . remotes/sub/master sub master.

+2

? , .

0

More articles:


All Articles