summaryrefslogtreecommitdiff
path: root/docs/git_subtree.md
diff options
context:
space:
mode:
authorCallum Oakley2017-08-19 10:34:45 +0100
committerCallum Oakley2017-08-19 10:34:45 +0100
commita6845036e25c4f4d936dcd12cd0ddedd2894b30e (patch)
treeb23b4e8d9d757aa3c0d42be561572533ae0d126c /docs/git_subtree.md
parent84a8aabe5bf8807595f98de44d18f6a31b892edf (diff)
parent7277f09bbadcce120f819132dec8ff7172caacc4 (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'docs/git_subtree.md')
-rw-r--r--docs/git_subtree.md7
1 files changed, 0 insertions, 7 deletions
diff --git a/docs/git_subtree.md b/docs/git_subtree.md
deleted file mode 100644
index 4fd7f8bea..000000000
--- a/docs/git_subtree.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## 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