diff options
Diffstat (limited to 'install_dev_githooks.sh')
| -rw-r--r-- | install_dev_githooks.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |