From 50564480fb98fc555f1e6abc97b75a79b7b2846d Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Tue, 5 Sep 2017 08:40:13 -0700
Subject: [PATCH] v0.18.2

---
 CHANGELOG.md | 6 ++++++
 setup.py     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23071a0f..c12396a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.18.2
+======
+- Fix `--all-files`, detection of staged files, detection of manually edited
+  files during merge conflict, and detection of files to push for non-ascii
+  filenames.
+
 0.18.1
 ======
 - Only mention locking when waiting for a lock.
diff --git a/setup.py b/setup.py
index 183ec175..e6ea9b9d 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
         'hooks.'
     ),
     url='https://github.com/pre-commit/pre-commit',
-    version='0.18.1',
+    version='0.18.2',
 
     author='Anthony Sottile',
     author_email='asottile@umich.edu',