diff options
| author | Dick Marinus <dick@mrns.nl> | 2019-09-28 04:34:34 +0200 |
|---|---|---|
| committer | Irina Truong <i.chernyavska@gmail.com> | 2019-09-27 19:34:34 -0700 |
| commit | 67799b98ab2d6ced76b8e46c4d857943225beab9 (patch) | |
| tree | 643230d99e253b41b8c443ff4970fe7d3af3631b | |
| parent | 88b829aa824deef1166e01ee5fa0ab8813e25cac (diff) | |
add optional but default squash merge request to PULL_REQUEST_TEMPLATE (#1095)
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 1 | ||||
| -rw-r--r-- | changelog.rst | 5 |
2 files changed, 6 insertions, 0 deletions
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). <!-- We would appreciate if you comply with our code style guidelines. --> - [ ] 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 ===== |