diff options
| author | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:58:42 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-04 11:58:42 -0400 |
| commit | ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (patch) | |
| tree | 31a51a8bfb3d0640984a5ec0505d23529fe14574 | |
| parent | 50600a71877fed94dae567a6ef5fc3b15c62b9b9 (diff) | |
Last release mistakenly contained my personal branch not master.
* 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.
| -rwxr-xr-x | contrib/post-merge-hook | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | propellor.cabal | 2 |
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> |