|author||Joey Hess||2018-02-04 11:58:42 -0400|
|committer||Joey Hess||2018-02-04 11:58:42 -0400|
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.
Diffstat (limited to 'contrib')
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/post-merge-hook b/contrib/post-merge-hook
index fa9ab5b6..4bbb1de7 100755
@@ -1,7 +1,7 @@
-# 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