From ab7a7f421c9b57b5963a44e57a6a4df7c594aca6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Feb 2018 11:58:42 -0400 Subject: 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. --- contrib/post-merge-hook | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/post-merge-hook') 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 -- cgit v1.2.3