Merge pull request #343 from commitizen-tools/docs/update-faq

docs(faq): add new questions to faq

Author: woile

docs/external_links.md

@@ -1,14 +1,16 @@
+> If you have written over commitizen, make a PR and add the link here 💪
+
 ## Talks
 
-- commitizen-tools: What can we gain from crafting a git message convention
-  - Speaker: Wei Lee
-  - Occasion: Taipey.py 2020 June Meetup, Remote Python Pizza 2020
-  - Material
-    - [slides](https://speakerdeck.com/leew/commitizen-tools-what-can-we-gain-from-crafting-a-git-message-convention-at-taipey-dot-py)
+| Name                                                                      | Speaker         | Occasion                                             | Language | Extra                                                                                                                            |
+| ------------------------------------------------------------------------- | --------------- | ---------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| commitizen-tools: What can we gain from crafting a git message convention | Wei Lee         | Taipey.py 2020 June Meetup, Remote Python Pizza 2020 | English  | [slides](https://speakerdeck.com/leew/commitizen-tools-what-can-we-gain-from-crafting-a-git-message-convention-at-taipey-dot-py) |
+| Automating release cycles                                                 | Santiago Fraire | PyAmsterdam June 24, 2020, Online                    | English  | [slides](https://woile.github.io/commitizen-presentation/)                                                                       |
+| [Automatizando Releases con Commitizen y Github Actions][automatizando]   | Santiago Fraire | PyConAr 2020, Remote                                 | Español  | [slides](https://woile.github.io/automating-releases-github-actions-presentation/#/)                                             |
 
 ## Articles
 
 - [Python Table Manners - Commitizen: 規格化 commit message](https://lee-w.github.io/posts/tech/2020/03/python-table-manners-commitizen/) (Written in Traditional Mandarin)
-- [Automating semantic release with commitizen](http://woile.github.io/posts/automating-semver-releases-with-commitizen/) (English)
+- [Automating semantic release with commitizen](https://woile.dev/posts/automating-semver-releases-with-commitizen/) (English)
 
-> If you have written about commitizen, you can make a PR to add the link here 💪
+[automatizando]: https://youtu.be/t3aE2M8UPBo

docs/faq.md

@@ -26,3 +26,50 @@ version_files = [
     "package.json:\"version\":"
 ]
 ```
+
+### Why are `revert` and `chore` valid types in the check pattern of cz conventional_commits but not types we can select?
+
+`revert` and `chore` are added to the "pattern" in `cz check` in order to prevent backward errors, but officially they are not part of conventional commits, we are using the latest [types from Angular](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#type) (they used to but were removed).
+However, you can create a customized `cz` with those extra types. (See [Customization](https://commitizen-tools.github.io/commitizen/customization/)
+
+See more discussion in issue [#142](https://github.com/commitizen-tools/commitizen/issues/142) and [#36](https://github.com/commitizen-tools/commitizen/issues/36)
+
+### How to revert a bump?
+
+If for any reason, the created tag and changelog were to be undone, this is the snippet:
+
+```sh
+git tag --delete <created_tag>
+git reset HEAD~
+git reset --hard HEAD
+```
+
+This will remove the last tag created, plus the commit containing the update to `.cz.toml` and the changelog generated for the version.
+
+In case the commit was pushed to the server you can remove it by running
+
+```sh
+git push --delete origin <created_tag>
+```
+
+## Is this project affiliated with the Commitizen JS project?
+
+It is not affiliated.
+
+Both are used for similar purposes, parsing commits, generating changelog and version we presume.
+This one is written in python to make integration easier for python projects and the other serves the JS packages.
+
+They differ a bit in design, not sure if cz-js does any of this, but these are some of the stuff you can do with this repo (python's commitizen):
+
+- create custom rules, version bumps and changelog generation, by default we use the popular conventional commits (I think cz-js allows this).
+- single package, install one thing and it will work (cz-js is a monorepo, but you have to install different dependencies AFAIK)
+- pre-commit integration
+- works on any language project, as long as you create the `.cz.toml` file.
+
+Where do they cross paths?
+
+If you are using conventional commits in your git history, then you could swap one with the other in theory.
+
+Regarding the name, [cz-js][cz-js] came first, they used the word commitizen first. When this project was created originally, the creator read "be a good commitizen", and thought it was just a cool word that made sense, and this would be a package that helps you be a good "commit citizen".
+
+[cz-js]: https://github.com/commitizen/cz-cli