Merge upstream QMK Firmware at '0.12.52~1'

1 files changed, 22 insertions, 8 deletions

diff --git a/readme.md b/readme.md
index b9639565e4..dd1aab5536 100644
--- a/readme.md
+++ b/readme.md
@@ -6,6 +6,14 @@
 [![GitHub forks](https://img.shields.io/github/forks/ErgoDox-EZ/qmk_firmware.svg?style=social&label=Fork)](https://github.com/ErgoDox-EZ/qmk_firmware/)
 
 This purpose of this fork is maintain a clean repo that only contains the keyboard code that we need, and as little else as possible.  This is to keep it lightweight, since we only need a couple of keyboards. This is the repo that the EZ Configurator will pull from. 
+## Documentation
+
+* [See the official documentation on docs.qmk.fm](https://docs.qmk.fm)
+
+The docs are powered by [Docsify](https://docsify.js.org/) and hosted on [GitHub](/docs/). They are also viewable offline; see [Previewing the Documentation](https://docs.qmk.fm/#/contributing?id=previewing-the-documentation) for more details.
+
+You can request changes by making a fork and opening a [pull request](https://github.com/qmk/qmk_firmware/pulls), or by clicking the "Edit this page" link at the bottom of any page.
+
 
 ## Supported Keyboards
 
@@ -24,8 +32,7 @@ qmk setup zsa/qmk_firmware -b firmware20
 
 ## Maintainers
 
-QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, [Hasu](https://github.com/tmk). The ZSA branch is maintained by Drashna, ZSA's official QMK Liaison, and by Florian Didron, ZSA's lead developer, with input from Erez Zukerman (ZSA CEO).
-
+QMK is developed and maintained by Jack Humbert of OLKB with contributions from the community, and of course, [Hasu](https://github.com/tmk). The OLKB product firmwares are maintained by [Jack Humbert](https://github.com/jackhumbert), the Ergodox EZ by [ZSA Technology Labs](https://github.com/zsa), the Clueboard by [Zach White](https://github.com/skullydazed), and the Atreus by [Phil Hagelberg](https://github.com/technomancy).
 
 # Update Process
 
@@ -41,8 +48,19 @@ QMK is developed and maintained by Jack Humbert of OLKB with contributions from
     - [https://github.com/qmk/qmk_firmware/commits/master/drivers](https://github.com/qmk/qmk_firmware/commits/master/drivers)
     - [https://github.com/qmk/qmk_firmware/commits/master/lib](https://github.com/qmk/qmk_firmware/commits/master/lib)
     - These folders are the important ones for maintaining the repo and keeping it properly up to date. Most, but not all, changes on this list should be pulled into our repo.
-3. `git cherry-pick` the commits we want
-    - `git rm docs/* -r` to remove the document updates when cherry picking. Repeat for any keyboard/keymap/etc that have changes that we aren't interested in
+4. `git merge (hash|tag)`
+    - `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/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 '{}' \;
+      ```
+    - Resolve merge conflicts, and commit.
+
 4. Commit update
    * Include commit info in `[changelog.md](http://changelog.md)` 
 5. Open Pull request, and include information about the commit
@@ -50,7 +68,3 @@ QMK is developed and maintained by Jack Humbert of OLKB with contributions from
 ## Strategy
 
 To keep PRs small and easier to test, they should ideally be 1:1 with commits from QMK Firmware master. They should only group commits if/when it makes sense. Such as multiple commits for a specific feature (split RGB support, for instance)
-
-## Merging
-
-Pull Requests should be merged/rebased, not squashed, so we can maintain a commit history that is close to QMK Firmware's, for ease of reference.