summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/post-merge-hook4
-rw-r--r--debian/changelog8
-rw-r--r--propellor.cabal2
3 files changed, 11 insertions, 3 deletions
diff --git a/contrib/post-merge-hook b/contrib/post-merge-hook
index fa9ab5b6..4bbb1de7 100755
--- a/contrib/post-merge-hook
+++ b/contrib/post-merge-hook
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# git post-merge hook, used by propellor's author to maintain a
-# joeyconfig branch with some changes while being able to merge
+# git post-merge (and post-checkout) hook, used by propellor's author to
+# maintain a joeyconfig branch with some changes while being able to merge
# between it and branches without the changes.
#
# Each time this hook is run, it checks if it's on a branch with
diff --git a/debian/changelog b/debian/changelog
index b1fb27af..a0471182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+propellor (5.3.1) UNRELEASED; urgency=medium
+
+ * Last release mistakenly contained my personal branch not master.
+ * contrib/post-merge-hook documentation updated to recommend also using
+ it as a post-checkout hook, to avoid such problems.
+
+ -- Joey Hess <id@joeyh.name> Sun, 04 Feb 2018 11:54:28 -0400
+
propellor (5.3.0) unstable; urgency=medium
* Avoid bogus warning about new upstream version when /usr/bin/propellor
diff --git a/propellor.cabal b/propellor.cabal
index f716b978..4f90c49c 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 5.3.0
+Version: 5.3.1
Cabal-Version: >= 1.20
License: BSD2
Maintainer: Joey Hess <id@joeyh.name>