diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2016-06-06 21:23:54 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2016-06-06 21:23:54 +0300 |
| commit | 718c2e2de138da2e4471decaeb47404cfa4aa34c (patch) | |
| tree | f4227f2156e6fae79973b55bb0016e99744e0fd9 /install_dev_githooks.sh | |
| parent | c07b944b9a0535f079ac14cfa849e1f099d38ed8 (diff) | |
upd
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 |