v1.4.0
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e657ccb..72705f0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v1.3.0
+ rev: v1.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b58ddbc..fa816fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+1.4.0
+=====
+
+### Features
+- `no-commit-to-branch`: allow `--branch` to be specified multiple times
+ - #190 PR by @moas.
+ - #294 PR by @asottile.
+- `check-merge-conflict`: add `--assume-in-merge` to force checks outside of a
+ merge commit situation
+ - #300 issue by @vinayinvicible.
+ - #301 PR by @vinayinvicible.
+
+### Fixes
+- Don't match whitespace in VCS urls
+ - #293 PR by @asottile.
+- Fix invalid escape sequences
+ - #296 PR by @asottile.
+- Fix `ResourcesWarning`s
+ - #297 PR by @asottile.
+
+### Misc
+- Test against python3.7
+ - #304 PR by @expobrain.
+
1.3.0
=====
diff --git a/README.md b/README.md
index 82830f4..f66e7d1 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
Add this to your `.pre-commit-config.yaml`
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v1.3.0 # Use the ref you want to point at
+ rev: v1.4.0 # Use the ref you want to point at
hooks:
- id: trailing-whitespace
# - id: ...
diff --git a/setup.py b/setup.py
index 4e1de26..138b3c4 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
name='pre_commit_hooks',
description='Some out-of-the-box hooks for pre-commit.',
url='https://github.com/pre-commit/pre-commit-hooks',
- version='1.3.0',
+ version='1.4.0',
author='Anthony Sottile',
author_email='asottile@umich.edu',
