diff options
| author | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-20 08:22:44 +0200 |
|---|---|---|
| committer | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-20 08:22:44 +0200 |
| commit | ee43856ff7ba37ea89d1a8a4700efba4e4f69571 (patch) | |
| tree | b0ed5b538396b0b2b027e69ad8ceac443c067c79 /docs/git_subtree.md | |
| parent | 99b6e918eab31d4f53cabc04a995da945335ac7f (diff) | |
| parent | 14c5160b1a94d5dc416002791b3c207ba0dca789 (diff) | |
Merge https://github.com/qmk/qmk_firmware
Diffstat (limited to 'docs/git_subtree.md')
| -rw-r--r-- | docs/git_subtree.md | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/docs/git_subtree.md b/docs/git_subtree.md deleted file mode 100644 index 4fd7f8beaa..0000000000 --- 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 |