summaryrefslogtreecommitdiff
path: root/readme.md
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2022-05-29 15:38:33 -0700
committerDrashna Jael're <drashna@live.com>2022-05-29 15:38:33 -0700
commit30aac80d5a6d8c6f7c06efb49189d748e70edc4a (patch)
treeceb11968ae41228e4b110c07467cdca7cc9cff22 /readme.md
parent67f4e5f34489abf986dedb4984b256692086c615 (diff)
parente22a183329fd05d39f88bb9dfebe98cfa7cd8402 (diff)
Merge remote-tracking branch 'qmk 0.17.0' into firmware21
Diffstat (limited to 'readme.md')
-rw-r--r--readme.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/readme.md b/readme.md
index 4a857c2ef1..3194939744 100644
--- a/readme.md
+++ b/readme.md
@@ -53,13 +53,18 @@ QMK is developed and maintained by Jack Humbert of OLKB with contributions from
- `git rm -rf docs users layouts .vscode` to remove the docs and user code that we don't want.
- To remove all of the keyboard exept the ones we want:
```sh
- find ./keyboards -mindepth 1 -maxdepth 1 -type d -not -name ergodox_ez -not -name planck -not -name moonlander -exec git rm -rf '{}' \;
+ find ./keyboards -mindepth 1 -maxdepth 1 -type d -not -name ergodox_ez -not -name planck -not -name moonlander -not -name pytest -exec git rm -rf '{}' \;
find ./keyboards/planck -mindepth 1 -maxdepth 1 -type d -not -name ez -not -name keymaps -exec git rm -rf '{}' \;
```
- To remove all of the keymaps from folder that we don't want:
```sh
find ./keyboards/ -mindepth 3 -maxdepth 3 -type d -not -name default -not -name oryx -not -name webusb -not -name glow -not -name reactive -not -name shine -not -name keymaps -exec git rm -rf '{}' \;
```
+ - Restore necessary files/folders:
+ ```sh
+ git checkout HEAD -- keyboards/handwired/pytest
+ git checkout HEAD -- layouts
+ ```
- Resolve merge conflicts, and commit.
4. Commit update