diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-08-03 10:52:30 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-08-03 10:52:30 -0400 |
| commit | c33434c0d64dd7cbd5f6371c7cb4ac5e05924944 (patch) | |
| tree | 59fe34d95089a59fa4e615fd995c81d274147bba /docs/git_subtree.md | |
| parent | db5bb7dbbfa2d2eb4f41aa4c768c3c5c8d73f563 (diff) | |
| parent | 07ba06d0b6e516bcfa4cbccbed9cfd8dc131072a (diff) | |
| download | firmware-c33434c0d64dd7cbd5f6371c7cb4ac5e05924944.tar.gz firmware-c33434c0d64dd7cbd5f6371c7cb4ac5e05924944.tar.bz2 firmware-c33434c0d64dd7cbd5f6371c7cb4ac5e05924944.zip | |
Merge branch 'master' into eco-keyboard
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 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 |