summaryrefslogtreecommitdiffstats
path: root/docs/git_subtree.md
diff options
context:
space:
mode:
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