summaryrefslogtreecommitdiff
path: root/docs/Git-subtree.md
diff options
context:
space:
mode:
authorJack Humbert2017-05-27 18:09:52 -0400
committerJack Humbert2017-05-27 18:09:52 -0400
commit704794bae3bf96541b0362ea38b84706d5ee6958 (patch)
tree866be7a6a63cb8e5f6f7c236303a796239ed9eae /docs/Git-subtree.md
parentd24da945d1dbfbe81177dd6611b0d5a27ab8344f (diff)
parente229dcadb5c9f8c09f14a439fe5a4c7c48ba2249 (diff)
subtree docs
Diffstat (limited to 'docs/Git-subtree.md')
-rw-r--r--docs/Git-subtree.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/Git-subtree.md b/docs/Git-subtree.md
new file mode 100644
index 000000000..4fd7f8bea
--- /dev/null
+++ b/docs/Git-subtree.md
@@ -0,0 +1,7 @@
+## Update core branch procedure
+ git co master
+ git subtree split -P tmk_core -b <tmp_branch>
+ git co core
+ git merge <tmp_branch>
+ git co master
+ git subtree merge -P tmk_core --squash