diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f655bc70..35e8486b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,3 +9,4 @@ - [ ] I've added my name to the `AUTHORS` file (or it's already there). - [ ] I installed pre-commit hooks (`pip install pre-commit && pre-commit install`), and ran `black` on my code. +- [x] Please squash merge this pull request (uncheck if you'd like us to merge as multiple commits) diff --git a/changelog.rst b/changelog.rst index 5384db7c..1ec7b729 100644 --- a/changelog.rst +++ b/changelog.rst @@ -15,6 +15,11 @@ Bug fixes: * History navigation bindings in multiline queries (#1004) (Thanks: `Pedro Ferrari`_) * Can't connect to pgbouncer database (#1093). (Thanks: `Irina Truong`_) +Internal: +--------- + +* Add optional but default squash merge request to PULL_REQUEST_TEMPLATE + 2.1.1 =====