diff options
| author | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-02 19:50:54 -0500 |
| commit | 4ba9917f829885b13ea1b3610a2f988e539c9e01 (patch) | |
| tree | 612da1c6de929e6e0a5b0847d7b594cb3becdf27 /docs/Git-subtree.md | |
| parent | 8665ed3efc62e649d0eac5b88761d7b3f8f30cd7 (diff) | |
| parent | aaa67f69305c5c78e15a1090ba7058adea59ff36 (diff) | |
| download | firmware-4ba9917f829885b13ea1b3610a2f988e539c9e01.tar.gz firmware-4ba9917f829885b13ea1b3610a2f988e539c9e01.tar.bz2 firmware-4ba9917f829885b13ea1b3610a2f988e539c9e01.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/Git-subtree.md')
| -rw-r--r-- | docs/Git-subtree.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/Git-subtree.md b/docs/Git-subtree.md new file mode 100644 index 000000000..4fd7f8bea --- /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 |