Skip to content

Commit

Permalink
v1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
asottile committed Jul 22, 2018
1 parent a10dec1 commit 219c70a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
=====

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ See also: https://github.com/pre-commit/pre-commit
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: ...
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='[email protected]',
Expand Down

0 comments on commit 219c70a

Please sign in to comment.