forked from roboguice/roboguice
-
Notifications
You must be signed in to change notification settings - Fork 0
/
HOWTO-SUBTREES.TXT
26 lines (20 loc) · 1007 Bytes
/
HOWTO-SUBTREES.TXT
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
A guice fork lies in the guice folder.
It comes from
https://github.com/stephanenicolas/google-guice
branch snicolas-mburton-blender-after-merge
will be changed to snicolas-mburton/blender
Documentation about subtrees:
* http://git-scm.com/book/en/Git-Tools-Subtree-Merging
* http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/
* http://makingsoftware.wordpress.com/2013/02/16/using-git-subtrees-for-repository-separation/
* https://help.github.com/articles/working-with-subtree-merge
* https://github.com/apenwarr/git-subtree/blob/master/git-subtree.txt
Most useful commands:
Once you have guice_blender_fork set as remote on [email protected]:stephanenicolas/google-guice.git
git remote add guice_blender_fork [email protected]:stephanenicolas/google-guice.git
ADD
---
* git subtree add --prefix=guice guice_blender_fork snicolas-mburton-blender-after-merge --squash
PULL
----
* git subtree pull --prefix=guice guice_blender_fork snicolas-mburton-blender-after-merge --squash