install update-version hook on post-merge

1 files changed, 2 insertions, 1 deletions

diff --git a/bin/init b/bin/init
index 61d5fdd..1a37399 100755
--- a/bin/init
+++ b/bin/init
@@ -9,9 +9,10 @@ fi
 
 if [ -d .git ]; then
     # seems likely we are running inside a git clone rather than an exported archive
-    # install the hook so that version info is updated on every commit/checkout
+    # install the hook so that version info is updated on every commit/checkout/pull
     ln -s ../../bin/update-version .git/hooks/post-commit
     ln -s ../../bin/update-version .git/hooks/post-checkout
+    ln -s ../../bin/update-version .git/hooks/post-merge
     # and run it now
     bin/update-version
 fi