aboutsummaryrefslogtreecommitdiffstats
path: root/Git-subtree.md
diff options
context:
space:
mode:
authortmk <tmk@users.noreply.github.com>2015-04-28 10:26:11 +0900
committertmk <tmk@users.noreply.github.com>2015-04-28 10:26:11 +0900
commit398c4feed469172eaddacd9a87a18c81a8259e48 (patch)
treeece922cb90c2f5e0d26b8c06a6304e3e25f0c7b4 /Git-subtree.md
parent5d7a4e3059db0e71823f0e240154eddc075a6d5f (diff)
downloadfirmware-398c4feed469172eaddacd9a87a18c81a8259e48.tar.gz
firmware-398c4feed469172eaddacd9a87a18c81a8259e48.tar.bz2
firmware-398c4feed469172eaddacd9a87a18c81a8259e48.zip
Created Git subtree (markdown)
Diffstat (limited to 'Git-subtree.md')
-rw-r--r--Git-subtree.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/Git-subtree.md b/Git-subtree.md
new file mode 100644
index 000000000..b2704ca2c
--- /dev/null
+++ b/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