diff options
Diffstat (limited to 'docs/git_subtree.md')
| -rw-r--r-- | docs/git_subtree.md | 7 |
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 @@ | |||
| 1 | ## Update core branch procedure | ||
| 2 | git co master | ||
| 3 | git subtree split -P tmk_core -b <tmp_branch> | ||
| 4 | git co core | ||
| 5 | git merge <tmp_branch> | ||
| 6 | git co master | ||
| 7 | git subtree merge -P tmk_core --squash | ||
