Merge branch 'subtree'

[fanfix.git] / libs / subtree.txt

diff --git a/libs/subtree.txt b/libs/subtree.txt
old mode 100644 (file)
new mode 100755 (executable)
index 2de0209..aea12d8
--- a/libs/subtree.txt
+++ b/libs/subtree.txt
@@ -1,5 +1,16 @@
 # Subtrees
 
-One subtree is used for this program:
-       ```git subtree add -P src/be/nikiroo/utils git@github.com:nikiroo/nikiroo-utils.git subtree```
+# The subtrees used for this program:
+#      ```git subtree add -P src/be/nikiroo/utils git@github.com:nikiroo/nikiroo-utils.git subtree```
+#      ```git subtree add -P src/jexer git@github.com:nikiroo/jexer.git subtree```
+
+# Update all subtrees:
+
+#git subtree pull -P src/be/nikiroo/utils git@github.com:nikiroo/nikiroo-utils.git subtree
+#git subtree pull -P src/jexer git@github.com:nikiroo/jexer.git subtree
+
+# Push all subtrees:
+
+git subtree push -P src/be/nikiroo/utils git@github.com:nikiroo/nikiroo-utils.git subtree
+git subtree push -P src/jexer git@github.com:nikiroo/jexer.git subtree