From 718c2e2de138da2e4471decaeb47404cfa4aa34c Mon Sep 17 00:00:00 2001
From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)"
 <spamtrap@nedprod.com>
Date: Mon, 6 Jun 2016 19:23:54 +0100
Subject: upd

---
 install_dev_githooks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'install_dev_githooks.sh')

diff --git a/install_dev_githooks.sh b/install_dev_githooks.sh
index 95c43f25..580d872f 100644
--- a/install_dev_githooks.sh
+++ b/install_dev_githooks.sh
@@ -3,6 +3,6 @@ echo Installing post-receive hook which recursively forces all
 echo submodules to latest commit after every git pull
 cat <<EOT >> .git/hooks/post-receive
 #!/bin/sh
-git submodule foreach --recursive 'branch=\$(git config -f \$toplevel/.gitmodules submodule.\$name.branch); [ \"\$branch\" = \"\" ] && branch=master; git checkout \$branch; git merge FETCH_HEAD'
+git submodule foreach --recursive 'branch=\$(git config -f \$toplevel/.gitmodules submodule.\$name.branch); [ \"\$branch\" = \"\" ] && branch=master; git checkout \$branch; git merge origin/$branch;'
 EOT
 chmod +x .git/hooks/post-receive
-- 
cgit v1.2.3