summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJoey Hess2018-02-04 11:58:42 -0400
committerJoey Hess2018-02-04 11:58:42 -0400
commitab7a7f421c9b57b5963a44e57a6a4df7c594aca6 (patch)
tree31a51a8bfb3d0640984a5ec0505d23529fe14574 /contrib
parent50600a71877fed94dae567a6ef5fc3b15c62b9b9 (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.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/post-merge-hook4
1 files changed, 2 insertions, 2 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