diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-10 14:58:24 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-06-10 14:58:24 -0400 |
| commit | ca01d94005f67ec4fa9528353481faa622d949ae (patch) | |
| tree | dd6d59d065492e3bb8192263a8a7e7cc0709c48f /docs/git_subtree.md | |
| parent | 558db0e03f0f3993e2b7fb5cc3f285393da0a4c3 (diff) | |
| download | qmk_firmware-ca01d94005f67ec4fa9528353481faa622d949ae.tar.gz qmk_firmware-ca01d94005f67ec4fa9528353481faa622d949ae.zip | |
convert docs to lowercase and underscores
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 @@ | |||
| 1 | ## Update core branch procedure | ||
| 2 | git co master | ||
| 3 | git subtree split -P tmk_core -b <tmp_branch> | ||
| 4 | git co core | ||
| 5 | git merge <tmp_branch> | ||
| 6 | git co master | ||
| 7 | git subtree merge -P tmk_core --squash | ||