aboutsummaryrefslogtreecommitdiff
path: root/docs/Git-subtree.md
diff options
context:
space:
mode:
authorNick Choi <[email protected]>2017-05-30 14:17:48 -0400
committerGitHub <[email protected]>2017-05-30 14:17:48 -0400
commit2c9f846608cbf91ce936071372634194745994d0 (patch)
tree7fc260baa3bca7ba748117e07fca8aaa186943dd /docs/Git-subtree.md
parent5393bc6f4eee3d3cb83997e5b03d8e5a5cea85d8 (diff)
parentcb791cf6cdbcd9fd1291f36f6b1a6840753db97f (diff)
downloadqmk_firmware-2c9f846608cbf91ce936071372634194745994d0.tar.gz
qmk_firmware-2c9f846608cbf91ce936071372634194745994d0.zip
Merge pull request #2 from qmk/master
pull in new qmk changes
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 0000000000..4fd7f8beaa
--- /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