diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2016-06-07 00:33:14 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2016-06-07 00:33:14 +0300 |
| commit | dc258685f712aeb6784a84425d6391154ffd4a07 (patch) | |
| tree | c03447cdd48cd318a132a38c123d3822587c07c4 /install_dev_githooks.sh | |
| parent | 758c0ecc4ff7ec5dd03f518089a13d894bd5a640 (diff) | |
fix install_dev_githooks.sh
Diffstat (limited to 'install_dev_githooks.sh')
| -rwxr-xr-x | install_dev_githooks.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install_dev_githooks.sh b/install_dev_githooks.sh index 580d872f..ace3cb0b 100755 --- a/install_dev_githooks.sh +++ b/install_dev_githooks.sh @@ -1,8 +1,8 @@ #!/bin/sh echo Installing post-receive hook which recursively forces all echo submodules to latest commit after every git pull -cat <<EOT >> .git/hooks/post-receive +cat <<EOT >> .git/hooks/post-merge #!/bin/sh 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 +chmod +x .git/hooks/post-merge |